Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaceAll() requires a global regex

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-07-24 18:29:18 +02:00
parent 75e9a5921e
commit f0973ce32b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/pi-hole/js/settings.js
View File

@@ -36,7 +36,7 @@ function setConfigValues(topic, key, value) {
} }
// else: we have a setting we can set // else: we have a setting we can set
var escapedKey = key.replaceAll(/\./, "\\."); var escapedKey = key.replaceAll(".", "\\.");
switch (value.type) { switch (value.type) {
case "enum (unsigned integer)": // fallthrough case "enum (unsigned integer)": // fallthrough
case "enum (string)": { case "enum (string)": {

4
scripts/pi-hole/js/utils.js
View File

@@ -30,7 +30,7 @@ function escapeHtml(text) {
// Return early when text is not a string // Return early when text is not a string
if (typeof text !== "string") return text; if (typeof text !== "string") return text;
return text.replaceAll(/[&<>"']/, function (m) { return text.replaceAll(/[&<>"']/g, function (m) {
return map[m]; return map[m];
}); });
} }
@@ -54,7 +54,7 @@ function unescapeHtml(text) {
if (text === null) return null; if (text === null) return null;
return text.replaceAll( return text.replaceAll(
/&(?:amp|lt|gt|quot|#039|Uuml|uuml|Auml|auml|Ouml|ouml|szlig);/, /&(?:amp|lt|gt|quot|#039|Uuml|uuml|Auml|auml|Ouml|ouml|szlig);/g,
function (m) { function (m) {
return map[m]; return map[m];
} }