Fix(tables): allow for one column table

Closes #406
showdownjs · Aug 5, 2017 · fef110c · fef110c
1 parent 8f05be7
commit fef110c
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 23 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/tables.js b/src/subParsers/tables.js
@@ -5,7 +5,9 @@ showdown.subParser('tables', function (text, options, globals) {
     return text;
   }
 
-  var tableRgx = /^ {0,3}\|?.+\|.+\n[ \t]{0,3}\|?[ \t]*:?[ \t]*(?:-|=){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:-|=){2,}[\s\S]+?(?:\n\n|¨0)/gm;
+  var tableRgx       = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|¨0)/gm,
+    //singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*\n(?: {0,3}\|.+\|\n)+(?:\n\n|¨0)/gm;
+      singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|\n( {0,3}\|.+\|\n)*(?:\n|¨0)/gm;
 
   function parseStyles (sLine) {
     if (/^:[ \t]*--*$/.test(sLine)) {
@@ -56,14 +58,7 @@ showdown.subParser('tables', function (text, options, globals) {
     return tb;
   }
 
-  text = globals.converter._dispatch('tables.before', text, options, globals);
-
-  // find escaped pipe characters
-  text = text.replace(/\\(\|)/g, showdown.helper.escapeCharactersCallback);
-
-  // parse tables
-  text = text.replace(tableRgx, function (rawTable) {
-
+  function parseTable (rawTable) {
     var i, tableLines = rawTable.split('\n');
 
     // strip wrong first and last column if wrapped tables are used
@@ -126,7 +121,18 @@ showdown.subParser('tables', function (text, options, globals) {
     }
 
     return buildTable(headers, cells);
-  });
+  }
+
+  text = globals.converter._dispatch('tables.before', text, options, globals);
+
+  // find escaped pipe characters
+  text = text.replace(/\\(\|)/g, showdown.helper.escapeCharactersCallback);
+
+  // parse multi column tables
+  text = text.replace(tableRgx, parseTable);
+
+  // parse one column tables
+  text = text.replace(singeColTblRgx, parseTable);
 
   text = globals.converter._dispatch('tables.after', text, options, globals);
 

diff --git a/test/features/tables/#406.does-not-render-one-column-tables.html b/test/features/tables/#406.does-not-render-one-column-tables.html
@@ -0,0 +1,81 @@
+<table>
+    <thead>
+    <tr>
+        <th>some header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td>some content</td>
+    </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+    <tr>
+        <th>some header</th>
+    </tr>
+    </thead>
+    <tbody>
+    </tbody>
+</table>
+<table>
+    <thead>
+    <tr>
+        <th>some header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td>some content</td>
+    </tr>
+    <tr>
+        <td>some content</td>
+    </tr>
+    <tr>
+        <td>some content</td>
+    </tr>
+    <tr>
+        <td>some content</td>
+    </tr>
+    <tr>
+        <td>some content</td>
+    </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+    <tr>
+        <th style="text-align:left;">some header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td style="text-align:left;">some content</td>
+    </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+    <tr>
+        <th style="text-align:right;">some header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td style="text-align:right;">some content</td>
+    </tr>
+    </tbody>
+</table>
+<table>
+    <thead>
+    <tr>
+        <th style="text-align:center;">some header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td style="text-align:center;">some content</td>
+    </tr>
+    </tbody>
+</table>
diff --git a/test/features/tables/#406.does-not-render-one-column-tables.md b/test/features/tables/#406.does-not-render-one-column-tables.md
@@ -0,0 +1,26 @@
+|some header |
+|------------|
+|some content|
+
+|some header |
+|------------|
+
+|some header |
+|------------|
+|some content|
+|some content|
+|some content|
+|some content|
+|some content|
+
+|some header |
+|:-----------|
+|some content|
+
+|some header |
+|-----------:|
+|some content|
+
+|some header |
+|:----------:|
+|some content|