feat(smoothLivePreview): fix weird effects due to parsing incomplete …

…input
showdownjs · Jul 14, 2015 · 62ba373 · 62ba373
1 parent 7ee2017
commit 62ba373
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 33 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/options.js b/src/options.js
@@ -65,6 +65,11 @@ function getDefaultOpts(simple) {
       default: false,
       describe: 'Turn on/off GFM tasklist support',
       type: 'boolean'
+    },
+    smoothLivePreview: {
+      default: false,
+      describe: 'Prevents weird effects in live previews due to incomplete input',
+      type: 'boolean'
     }
   };
   if (simple === false) {

diff --git a/src/subParsers/headers.js b/src/subParsers/headers.js
@@ -2,7 +2,7 @@ showdown.subParser('headers', function (text, options, globals) {
   'use strict';
 
   var prefixHeader = options.prefixHeaderId,
-      headerLevelStart = (isNaN(parseInt(options.headerLevelStart))) ? 1 : parseInt(options.headerLevelStart);
+      headerLevelStart = (isNaN(parseInt(options.headerLevelStart))) ? 1 : parseInt(options.headerLevelStart),
 
   // Set text-style headers:
   //	Header 1
@@ -11,7 +11,10 @@ showdown.subParser('headers', function (text, options, globals) {
   //	Header 2
   //	--------
   //
-  text = text.replace(/^(.+)[ \t]*\n=+[ \t]*\n+/gm, function (wholeMatch, m1) {
+      setextRegexH1 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n={2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n=+[ \t]*\n+/gm,
+      setextRegexH2 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n-+[ \t]*\n+/gm;
+
+  text = text.replace(setextRegexH1, function (wholeMatch, m1) {
 
     var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
         hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
@@ -20,7 +23,7 @@ showdown.subParser('headers', function (text, options, globals) {
     return showdown.subParser('hashBlock')(hashBlock, options, globals);
   });
 
-  text = text.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm, function (matchFound, m1) {
+  text = text.replace(setextRegexH2, function (matchFound, m1) {
     var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
         hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
         hLevel = headerLevelStart + 1,
@@ -35,18 +38,6 @@ showdown.subParser('headers', function (text, options, globals) {
   //  ...
   //  ###### Header 6
   //
-
-  /*
-   text = text.replace(/
-   ^(\#{1,6})				// $1 = string of #'s
-   [ \t]*
-   (.+?)					// $2 = Header text
-   [ \t]*
-   \#*						// optional closing #'s (not counted)
-   \n+
-   /gm, function() {...});
-   */
-
   text = text.replace(/^(#{1,6})[ \t]*(.+?)[ \t]*#*\n+/gm, function (wholeMatch, m1, m2) {
     var span = showdown.subParser('spanGamut')(m2, options, globals),
         hID = (options.noHeaderId) ? '' : ' id="' + headerId(m2) + '"',