fix(openLinksInNewWindow): encode _ to prevent clash with em

Closes #379
showdownjs · Apr 25, 2017 · 813f832 · 813f832
1 parent 71acff5
commit 813f832
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 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/anchors.js b/src/subParsers/anchors.js
@@ -51,7 +51,8 @@ showdown.subParser('anchors', function (text, options, globals) {
     }
 
     if (options.openLinksInNewWindow) {
-      result += ' target="_blank"';
+      // escaped _
+      result += ' target="¨E95Eblank"';
     }
 
     result += '>' + linkText + '</a>';

diff --git a/src/subParsers/autoLinks.js b/src/subParsers/autoLinks.js
@@ -21,7 +21,7 @@ var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(
           append = trailingPunctuation;
         }
         if (options.openLinksInNewWindow) {
-          target = ' target="_blank"';
+          target = ' target="¨E95Eblank"';
         }
         return '<a href="' + link + '"' + target + '>' + lnkTxt + '</a>' + append;
       };

diff --git a/test/features/#379.openLinksInNewWindow-breaks-em-markdup.html b/test/features/#379.openLinksInNewWindow-breaks-em-markdup.html
@@ -0,0 +1,2 @@
+<p>My <a href="http://example.com" target="_blank">link</a> is <em>important</em></p>
+<p>My <a href="http://example.com" target="_blank">link</a> is <strong>important</strong></p>
diff --git a/test/features/#379.openLinksInNewWindow-breaks-em-markdup.md b/test/features/#379.openLinksInNewWindow-breaks-em-markdup.md
@@ -0,0 +1,3 @@
+My [link](http://example.com) is _important_
+
+My [link](http://example.com) is __important__
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
@@ -78,6 +78,8 @@ describe('makeHtml() features testsuite', function () {
         converter = new showdown.Converter({simplifiedAutoLink: true, strikethrough: true});
       } else if (testsuite[i].name === '#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs') {
         converter = new showdown.Converter({simplifiedAutoLink: true, excludeTrailingPunctuationFromURLs: true});
+      } else if (testsuite[i].name === '#379.openLinksInNewWindow-breaks-em-markdup') {
+        converter = new showdown.Converter({openLinksInNewWindow: true});
       } else {
         converter = new showdown.Converter();
       }