fix(excludeTrailingPunctuationFromURLs): fix weird character when thi…

…s option with simplifiedAutoLinks Closes #378
showdownjs · Apr 23, 2017 · 71acff5 · 71acff5
1 parent 1bca88f
commit 71acff5
Show file tree

Hide file tree

Showing 8 changed files with 9 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/subParsers/autoLinks.js b/src/subParsers/autoLinks.js
@@ -3,7 +3,7 @@
 var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(?=\s|$)(?!["<>])/gi,
     simpleURLRegex2 = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+?)([.!?,()\[\]]?)(?=\s|$)(?!["<>])/gi,
     //simpleURLRegex3 = /\b(((https?|ftp):\/\/|www\.)[a-z\d.-]+\.[a-z\d_.~:/?#\[\]@!$&'()*+,;=-]+?)([.!?()]?)(?=\s|$)(?!["<>])/gi,
-    delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi,
+    delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)()>/gi,
     simpleMailRegex = /(^|\s)(?:mailto:)?([A-Za-z0-9!#$%&'*+-/=?^_`{|}~.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?=$|\s)/gmi,
     delimMailRegex  = /<()(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,
 

diff --git a/test/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html b/test/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.html
@@ -0,0 +1 @@
+<p>Example <a href="http://example.com">http://example.com</a></p>
diff --git a/test/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md b/test/features/#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs.md
@@ -0,0 +1 @@
+Example <http://example.com>
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
@@ -76,6 +76,8 @@ describe('makeHtml() features testsuite', function () {
         converter = new showdown.Converter({prefixHeaderId: 'my prefix ', ghCompatibleHeaderId: true});
       } else if (testsuite[i].name === 'simplifiedAutoLink') {
         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 {
         converter = new showdown.Converter();
       }