fix(strikethrough): Fix strikethrough issue with escaped chars

Closes #214
showdownjs · Oct 30, 2015 · 5669317 · 5669317
1 parent f81789f
commit 5669317
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 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/strikethrough.js b/src/subParsers/strikethrough.js
@@ -3,7 +3,7 @@ showdown.subParser('strikethrough', function (text, options, globals) {
 
   if (options.strikethrough) {
     text = globals.converter._dispatch('strikethrough.before', text, options);
-    text = text.replace(/(?:~T){2}([^~]+)(?:~T){2}/g, '<del>$1</del>');
+    text = text.replace(/(?:~T){2}([\s\S]+?)(?:~T){2}/g, '<del>$1</del>');
     text = globals.converter._dispatch('strikethrough.after', text, options);
   }
 

diff --git a/test/features/#214.escaped-markdown-chars-break-strikethrough.html b/test/features/#214.escaped-markdown-chars-break-strikethrough.html
@@ -0,0 +1 @@
+<p>Your friend <del><a href="www.google.com"><strong>test*</strong></a></del> (<del><a href="www.google.com"><em>@test</em></a></del>) updated his/her description</p>
diff --git a/test/features/#214.escaped-markdown-chars-break-strikethrough.md b/test/features/#214.escaped-markdown-chars-break-strikethrough.md
@@ -0,0 +1 @@
+Your friend ~~[**test\***](www.google.com)~~ (~~[*@test*](www.google.com)~~) updated his/her description
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
@@ -19,7 +19,7 @@ describe('makeHtml() features testsuite', function () {
       converter = new showdown.Converter({simplifiedAutoLink: true});
     } else if (testsuite[i].name === '#164.2.disallow-underscore-emphasis-mid-word') {
       converter = new showdown.Converter({literalMidWordUnderscores: true});
-    } else if (testsuite[i].name === '#164.3.strikethrough') {
+    } else if (testsuite[i].name === '#164.3.strikethrough' || testsuite[i].name === '#214.escaped-markdown-chars-break-strikethrough') {
       converter = new showdown.Converter({strikethrough: true});
     } else if (testsuite[i].name === 'disable-gh-codeblocks') {
       converter = new showdown.Converter({ghCodeBlocks: false});