Skip to content

Commit d42a398

Browse files
committed
Merge branch 'support_single_quote' of git://github.com/jrsquared/Autolinker.js into jrsquared-support_single_quote
Conflicts: dist/Autolinker.js dist/Autolinker.min.js
2 parents dc84853 + 3a6a328 commit d42a398

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

dist/Autolinker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246

247247
// Allow optional path, query string, and hash anchor, not ending in the following characters: "!:,.;"
248248
// http://blog.codinghorror.com/the-problem-with-urls/
249-
urlSuffixRegex = /(?:[\-A-Za-z0-9+&@#\/%?=~_()|!:,.;\$\*]*[\-A-Za-z0-9+&@#\/%=~_()|\$\*])?/; // note: optional part of the full regex
249+
urlSuffixRegex = /(?:[\-A-Za-z0-9+&@#\/%?=~_()|!:,.;'\$\*]*[\-A-Za-z0-9+&@#\/%=~_()|'\$\*])?/; // note: optional part of the full regex
250250

251251
return new RegExp( [
252252
'(', // *** Capturing group $1, which can be used to check for a twitter handle match. Use group $3 for the actual twitter handle though. $2 may be used to reconstruct the original string in a replace()

0 commit comments

Comments
 (0)