瀏覽代碼

fix(encodeEmail): now produces valid emails

Closes #340
Estevao Soares dos Santos 8 年之前
父節點
當前提交
605d8b7b05

+ 5 - 1
dist/showdown.js

@@ -170,6 +170,10 @@ var showdown = {},
         ghCompatibleHeaderId:                 true,
         ghMentions:                           true
       },
+      original: {
+        noHeaderId:                           true,
+        ghCodeBlocks:                         false
+      },
       vanilla: getDefaultOpts(true),
       allOn: allOptionsOn()
     };
@@ -1404,8 +1408,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;
     }

文件差異過大導致無法顯示
+ 0 - 0
dist/showdown.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/showdown.min.js


文件差異過大導致無法顯示
+ 0 - 0
dist/showdown.min.js.map


+ 4 - 0
src/showdown.js

@@ -25,6 +25,10 @@ var showdown = {},
         ghCompatibleHeaderId:                 true,
         ghMentions:                           true
       },
+      original: {
+        noHeaderId:                           true,
+        ghCodeBlocks:                         false
+      },
       vanilla: getDefaultOpts(true),
       allOn: allOptionsOn()
     };

+ 1 - 1
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;
     }

+ 0 - 0
test/cases/obfuscated-emails.html


+ 0 - 0
test/cases/obfuscated-emails.md


部分文件因文件數量過多而無法顯示