fix(simplifiedAutoLink): fix missing spaces before and after email ad…

…dresses Space char before and after the linked email address is no longer dropped with "simplifiedAutoLink" option enabled. Closes #330
showdownjs · Jan 27, 2017 · 5190b6a · 5190b6a
1 parent 90c52b8
commit 5190b6a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 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
@@ -6,8 +6,8 @@ showdown.subParser('autoLinks', function (text, options, globals) {
   var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(?=\s|$)(?!["<>])/gi,
       simpleURLRegex2 = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+?)([.!?()]?)(?=\s|$)(?!["<>])/gi,
       delimUrlRegex   = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi,
-      simpleMailRegex = /(?:^|\s)([A-Za-z0-9!#$%&'*+-/=?^_`{|}~.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?:$|\s)/gi,
-      delimMailRegex  = /<(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/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;
 
   text = text.replace(delimUrlRegex, replaceLink);
   text = text.replace(delimMailRegex, replaceMail);
@@ -35,16 +35,17 @@ showdown.subParser('autoLinks', function (text, options, globals) {
     return '<a href="' + link + '">' + lnkTxt + '</a>' + append;
   }
 
-  function replaceMail(wholeMatch, mail) {
+  function replaceMail(wholeMatch, b, mail) {
     var href = 'mailto:';
+    b = b || '';
     mail = showdown.subParser('unescapeSpecialChars')(mail);
     if (options.encodeEmails) {
       mail = showdown.helper.encodeEmailAddress(mail);
       href = showdown.helper.encodeEmailAddress(href + mail);
     } else {
       href = href + mail;
     }
-    return '<a href="' + href + '">' + mail + '</a>';
+    return b + '<a href="' + href + '">' + mail + '</a>';
   }
 
   text = globals.converter._dispatch('autoLinks.after', text, options, globals);

diff --git a/test/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html b/test/features/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.html
@@ -0,0 +1 @@
+<p>Just an example <a href="mailto:info@example.com">info@example.com</a> ok?</p>
diff --git a/...eatures/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md b/...eatures/#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail.md
@@ -0,0 +1 @@
+Just an example info@example.com ok?
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
@@ -55,6 +55,8 @@ describe('makeHtml() features testsuite', function () {
       converter = new showdown.Converter({ghMentions: true});
     } else if (testsuite[i].name === 'disable-email-encoding') {
       converter = new showdown.Converter({encodeEmails: false});
+    } else if (testsuite[i].name === '#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail') {
+      converter = new showdown.Converter({encodeEmails: false, simplifiedAutoLink: true});
     } else {
       converter = new showdown.Converter();
     }