Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'abackstrom/striplinkdefinitions-endstring'

  • Loading branch information...
commit 8a8820634e04b06ad32af05aeeb202159967ec15 2 parents e517605 + 6645ca1
@coreyti coreyti authored
Showing with 8 additions and 1 deletion.
  1. +8 −1 src/showdown.js
View
9 src/showdown.js
@@ -286,7 +286,11 @@ var _StripLinkDefinitions = function(text) {
/gm,
function(){...});
*/
- var text = text.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|\Z)/gm,
+
+ // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+ text += "~0";
+
+ var text = text.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|(?=~0))/gm,
function (wholeMatch,m1,m2,m3,m4) {
m1 = m1.toLowerCase();
g_urls[m1] = _EncodeAmpsAndAngles(m2); // Link IDs are case-insensitive
@@ -303,6 +307,9 @@ var _StripLinkDefinitions = function(text) {
}
);
+ // attacklab: strip sentinel
+ text = text.replace(/~0/,"");
+
return text;
}
Please sign in to comment.
Something went wrong with that request. Please try again.