jeena/showdown
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Corey Innis 2012-10-31 01:16:05 -07:00
commit 8a8820634e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/showdown.js
View file

@ -286,7 +286,11 @@ var _StripLinkDefinitions = function(text) {
/gm, /gm,
function(){...}); 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) { function (wholeMatch,m1,m2,m3,m4) {
m1 = m1.toLowerCase(); m1 = m1.toLowerCase();
g_urls[m1] = _EncodeAmpsAndAngles(m2); // Link IDs are case-insensitive 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; return text;
} }