From 482de0638d461e103d61290c76e4f9db677a1c18 Mon Sep 17 00:00:00 2001 From: SolarisFox Date: Sun, 17 May 2015 13:27:06 -0700 Subject: [PATCH 1/2] linking to pullreqs --- js/battledata.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/js/battledata.js b/js/battledata.js index 3ad87d1b6..ccb9fc379 100644 --- a/js/battledata.js +++ b/js/battledata.js @@ -418,6 +418,20 @@ var Tools = { return '' + p0 + ''; }); + // server issue #pullreq + // Links to github Pokemon Showdown server pullreq number + str = str.replace(/\bserver issue ?#(\d+)/ig, function(p0, p1) { + p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1))); + return '' + p0 + ''; + }); + // client issue #pullreq + // Links to github Pokemon Showdown client pullreq number + str = str.replace(/\bclient issue ?#(\d+)/ig, function(p0, p1) { + p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1))); + return '' + p0 + ''; + }); // [[blah]] // Short form of gl[blah] str = str.replace(/\[\[([^< ](?:[^<`]*?[^< ])??)\]\]/ig, function(p0, p1) { From 585bf2519fa168357ab1027ba8cf075dfb286b70 Mon Sep 17 00:00:00 2001 From: SolarisFox Date: Sun, 17 May 2015 20:04:16 -0700 Subject: [PATCH 2/2] remove gl [blah] linking --- js/battledata.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/js/battledata.js b/js/battledata.js index ccb9fc379..ad7f3e524 100644 --- a/js/battledata.js +++ b/js/battledata.js @@ -396,21 +396,12 @@ var Tools = { '" target="_blank" onclick="' + onclick + '">' + uri + ''; }); // google [blah] - // google[blah] // Google search for 'blah' str = str.replace(/\bgoogle ?\[([^\]<]+)\]/ig, function(p0, p1) { p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1))); return '' + p0 + ''; }); - // gl [blah] - // gl[blah] - // Google search for 'blah' and visit the first result ("I'm feeling lucky") - str = str.replace(/\bgl ?\[([^\]<]+)\]/ig, function(p0, p1) { - p1 = Tools.escapeHTML(encodeURIComponent(Tools.unescapeHTML(p1))); - return '' + p0 + ''; - }); // wiki [blah] // Search Wikipedia for 'blah' (and visit the article for 'blah' if it exists) str = str.replace(/\bwiki ?\[([^\]<]+)\]/ig, function(p0, p1) {