From 41a9c54cfce574d6437bbbf8cec15da58823adf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A4r=20Halberkamp?= Date: Thu, 15 Jun 2017 22:32:24 -0400 Subject: [PATCH] Add and (#944) --- js/battledata.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/js/battledata.js b/js/battledata.js index ceff2bec3..0fabaa4aa 100644 --- a/js/battledata.js +++ b/js/battledata.js @@ -786,7 +786,16 @@ var Tools = { return {attribs: attribs}; }; return function (input) { - return html.sanitizeWithPolicy(getString(input), tagPolicy); + // Implement and + input = getString(input).replace(/<(pokemon|item)icon>([^<]*)<\/\1icon>/g, function (match, p1, p2) { + if (p1 === 'pokemon') { + return ''; + } else if (p1 === 'item') { + return ''; + } + }); + + return html.sanitizeWithPolicy(input, tagPolicy); }; })(),