mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
Merge remote-tracking branch 'abackstrom/striplinkdefinitions-endstring'
This commit is contained in:
commit
8a8820634e
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user