fix(subparsers/tables.js): fix parser order so that tables include al…

…l spanGamut elements
showdownjs · Jul 11, 2015 · 5ec75c4 · 5ec75c4
1 parent 0a3a0df
commit 5ec75c4
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 5 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/converter.js b/src/converter.js
@@ -44,7 +44,6 @@ showdown.Converter = function (converterOptions) {
        * @type {string[]}
        */
       parserOrder = [
-        'tables',
         'githubCodeBlocks',
         'hashHTMLBlocks',
         'stripLinkDefinitions',

diff --git a/src/subParsers/blockGamut.js b/src/subParsers/blockGamut.js
@@ -13,6 +13,7 @@ showdown.subParser('blockGamut', function (text, options, globals) {
   text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
   text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key);
 
+  text = showdown.subParser('tables')(text, options, globals);
   text = showdown.subParser('lists')(text, options, globals);
   text = showdown.subParser('codeBlocks')(text, options, globals);
   text = showdown.subParser('blockQuotes')(text, options, globals);

diff --git a/test/features/tables/with-span-elements.html b/test/features/tables/with-span-elements.html
@@ -0,0 +1,26 @@
+<table>
+    <thead>
+    <tr>
+        <th>First Header</th>
+        <th>Second Header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><strong>bold</strong></td>
+        <td><img src="foo.jpg" alt="img" /></td>
+    </tr>
+    <tr>
+        <td><em>italic</em></td>
+        <td><a href="bla.html">link</a></td>
+    </tr>
+    <tr>
+        <td><code>some code</code></td>
+        <td><a href="www.google.com">google</a></td>
+    </tr>
+    <tr>
+        <td><a href="www.foo.com">www.foo.com</a></td>
+        <td>normal</td>
+    </tr>
+    </tbody>
+</table>
diff --git a/test/features/tables/with-span-elements.md b/test/features/tables/with-span-elements.md
@@ -0,0 +1,9 @@
+| First Header  | Second Header     |
+| ------------- | ----------------- |
+| **bold**      | ![img](foo.jpg)   |
+| _italic_      | [link](bla.html)  |
+| `some code`   | [google][1]       |
+| <www.foo.com> | normal            |
+
+
+  [1]: www.google.com