浏览代码

fix(excludeTrailingPunctuationFromURL): add comma to punctuation list

Closes #354
Estevao Soares dos Santos 8 年之前
父节点
当前提交
fa35fd5e7e

+ 2 - 2
dist/showdown.js

@@ -1,4 +1,4 @@
-;/*! showdown 05-03-2017 */
+;/*! showdown 09-03-2017 */
 (function(){
 /**
  * Created by Tivie on 13-07-2015.
@@ -1386,7 +1386,7 @@ showdown.subParser('anchors', function (text, options, globals) {
 // url allowed chars [a-z\d_.~:/?#[]@!$&'()*+,;=-]
 
 var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(?=\s|$)(?!["<>])/gi,
-    simpleURLRegex2 = /\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,
     simpleMailRegex = /(^|\s)(?:mailto:)?([A-Za-z0-9!#$%&'*+-/=?^_`{|}~.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?=$|\s)/gmi,

文件差异内容过多而无法显示
+ 0 - 0
dist/showdown.js.map


文件差异内容过多而无法显示
+ 1 - 1
dist/showdown.min.js


文件差异内容过多而无法显示
+ 0 - 0
dist/showdown.min.js.map


+ 1 - 1
src/subParsers/autoLinks.js

@@ -1,7 +1,7 @@
 // url allowed chars [a-z\d_.~:/?#[]@!$&'()*+,;=-]
 
 var simpleURLRegex  = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(?=\s|$)(?!["<>])/gi,
-    simpleURLRegex2 = /\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,
     simpleMailRegex = /(^|\s)(?:mailto:)?([A-Za-z0-9!#$%&'*+-/=?^_`{|}~.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?=$|\s)/gmi,

+ 2 - 0
test/features/excludeTrailingPunctuationFromURLs-option.html

@@ -2,3 +2,5 @@
 <p>url <a href="http://www.google.com">http://www.google.com</a>!</p>
 <p>url <a href="http://www.google.com">http://www.google.com</a>? foo</p>
 <p>url (<a href="http://www.google.com">http://www.google.com</a>) bazinga</p>
+<p>url [<a href="http://www.google.com">http://www.google.com</a>] bazinga</p>
+<p>url <a href="http://www.google.com">http://www.google.com</a>, bar</p>

+ 4 - 0
test/features/excludeTrailingPunctuationFromURLs-option.md

@@ -5,3 +5,7 @@ url http://www.google.com!
 url http://www.google.com? foo
 
 url (http://www.google.com) bazinga
+
+url [http://www.google.com] bazinga
+
+url http://www.google.com, bar

部分文件因为文件数量过多而无法显示