fix(lists): fix github code blocks not being parsed inside lists

Fix ghCodeBlocks not being correctly parsed inside lists. Also, as a side effect, fixes issues with consecutive lists and extra paragraphs being added into lists. Closes #142, Closes #183, Closes #184
showdownjs · Aug 1, 2015 · 7720c88 · 7720c88
1 parent 086c41d
commit 7720c88
Show file tree

Hide file tree

Showing 20 changed files with 282 additions and 219 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/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "showdown",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A Markdown to HTML converter written in Javascript",
   "author": "Estevão Santos",
   "homepage": "http://showdownjs.github.io/showdown/",

diff --git a/src/subParsers/githubCodeBlocks.js b/src/subParsers/githubCodeBlocks.js
@@ -18,14 +18,8 @@ showdown.subParser('githubCodeBlocks', function (text, options, globals) {
 
   text += '~0';
 
-  text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, m1, m2) {
-    var language = m1,
-        codeblock = m2,
-        end = '\n';
-
-    if (options.omitExtraWLInCodeBlocks) {
-      end = '';
-    }
+  text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
+    var end = (options.omitExtraWLInCodeBlocks) ? '' : '\n';
 
     codeblock = showdown.subParser('encodeCode')(codeblock);
     codeblock = showdown.subParser('detab')(codeblock);