From dca9a00563fb3421ab47f02107c93bf93d6d9350 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Tue, 25 Feb 2025 17:58:40 -0300 Subject: [PATCH 1/2] Change kind from "exact" to "regex" only after the loop Signed-off-by: RD WebDesign --- scripts/js/groups-domains.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/js/groups-domains.js b/scripts/js/groups-domains.js index 8ffc2054..975d2d86 100644 --- a/scripts/js/groups-domains.js +++ b/scripts/js/groups-domains.js @@ -496,15 +496,17 @@ function addDomain() { return; } - for (var i = 0; i < domains.length; i++) { - if (kind === "exact" && wildcardChecked) { + // Check if the wildcard checkbox was marked and transform the domains into regex + if (kind === "exact" && wildcardChecked) { + for (var i = 0; i < domains.length; i++) { // Transform domain to wildcard if specified by user domains[i] = "(\\.|^)" + domains[i].replaceAll(".", "\\.") + "$"; - kind = "regex"; // strip leading "*." if specified by user in wildcard mode if (domains[i].startsWith("*.")) domains[i] = domains[i].substr(2); } + + kind = "regex"; } // determine list type From f3684533aa68af9532fe22eae7d07983ff3fe876 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Wed, 26 Feb 2025 14:24:25 -0300 Subject: [PATCH 2/2] Remove leading "*." before turning the domain into a regex Signed-off-by: RD WebDesign --- scripts/js/groups-domains.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/js/groups-domains.js b/scripts/js/groups-domains.js index 975d2d86..8c8f86e5 100644 --- a/scripts/js/groups-domains.js +++ b/scripts/js/groups-domains.js @@ -499,11 +499,11 @@ function addDomain() { // Check if the wildcard checkbox was marked and transform the domains into regex if (kind === "exact" && wildcardChecked) { for (var i = 0; i < domains.length; i++) { - // Transform domain to wildcard if specified by user - domains[i] = "(\\.|^)" + domains[i].replaceAll(".", "\\.") + "$"; - - // strip leading "*." if specified by user in wildcard mode + // Strip leading "*." if specified by user in wildcard mode if (domains[i].startsWith("*.")) domains[i] = domains[i].substr(2); + + // Transform domain into a wildcard regex + domains[i] = "(\\.|^)" + domains[i].replaceAll(".", "\\.") + "$"; } kind = "regex";