fix(encodeEmail): now produces valid emails

Closes #340
showdownjs · Feb 6, 2017 · 605d8b7 · 605d8b7
1 parent 368f0b6
commit 605d8b7
Show file tree

Hide file tree

Showing 8 changed files with 13 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/showdown.js b/src/showdown.js
@@ -25,6 +25,10 @@ var showdown = {},
         ghCompatibleHeaderId:                 true,
         ghMentions:                           true
       },
+      original: {
+        noHeaderId:                           true,
+        ghCodeBlocks:                         false
+      },
       vanilla: getDefaultOpts(true),
       allOn: allOptionsOn()
     };

diff --git a/src/subParsers/autoLinks.js b/src/subParsers/autoLinks.js
@@ -40,8 +40,8 @@ showdown.subParser('autoLinks', function (text, options, globals) {
     b = b || '';
     mail = showdown.subParser('unescapeSpecialChars')(mail, options, globals);
     if (options.encodeEmails) {
-      mail = showdown.helper.encodeEmailAddress(mail);
       href = showdown.helper.encodeEmailAddress(href + mail);
+      mail = showdown.helper.encodeEmailAddress(mail);
     } else {
       href = href + mail;
     }

diff --git a/test/cases/obfuscated-emails.html b/test/cases/obfuscated-emails.html
diff --git a/test/cases/obfuscated-emails.md b/test/cases/obfuscated-emails.md