fix(simpleautolink): fix mail simpleAutoLink to ignore urls with @ sy…

…mbol Urls with @ symbol will not be incorrectly converted to mail addressed Closes #204
showdownjs · Oct 7, 2015 · 8ebb25e · 8ebb25e
1 parent c4e82d8
commit 8ebb25e
Show file tree

Hide file tree

Showing 8 changed files with 22 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/autoLinks.js b/src/subParsers/autoLinks.js
@@ -5,7 +5,7 @@ showdown.subParser('autoLinks', function (text, options) {
 
   var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)(?=\s|$)(?!["<>])/gi,
       delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi,
-      simpleMailRegex = /\b(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)\b/gi,
+      simpleMailRegex = /(?:^|[ \n\t])([A-Za-z0-9!#$%&'*+-/=?^_`\{|}~\.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?:$|[ \n\t])/gi,
       delimMailRegex  = /<(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi;
 
   text = text.replace(delimUrlRegex, '<a href=\"$1\">$1</a>');

diff --git a/test/features/#204.certain-links-with-at-and-dot-break-url.html b/test/features/#204.certain-links-with-at-and-dot-break-url.html
@@ -0,0 +1,7 @@
+<p><a href="http://website.com/img@x2.jpg">http://website.com/img@x2.jpg</a></p>
+
+<p><a href="http://website.com/img-x2.jpg">http://website.com/img-x2.jpg</a></p>
+
+<p><a href="http://website.com/img@x2">http://website.com/img@x2</a></p>
+
+<p><a href="http://website.com/img@.jpg">http://website.com/img@.jpg</a></p>
diff --git a/test/features/#204.certain-links-with-at-and-dot-break-url.md b/test/features/#204.certain-links-with-at-and-dot-break-url.md
@@ -0,0 +1,7 @@
+http://website.com/img@x2.jpg
+
+http://website.com/img-x2.jpg
+
+http://website.com/img@x2
+
+http://website.com/img@.jpg
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
@@ -15,7 +15,7 @@ describe('makeHtml() features testsuite', function () {
       converter = new showdown.Converter({parseImgDimensions: true});
     } else if (testsuite[i].name === '#69.header_level_start') {
       converter = new showdown.Converter({headerLevelStart: 3});
-    } else if (testsuite[i].name === '#164.1.simple_autolink') {
+    } else if (testsuite[i].name === '#164.1.simple_autolink' || testsuite[i].name === '#204.certain-links-with-at-and-dot-break-url') {
       converter = new showdown.Converter({simplifiedAutoLink: true});
     } else if (testsuite[i].name === '#164.2.disallow_underscore_emphasis_mid_word') {
       converter = new showdown.Converter({literalMidWordUnderscores: true});