Refactor (custom) site rules

changelog.txt

@@ -6,6 +6,7 @@ Fix Lee Enterprises Group
 Fix LesEchos.fr (json)
 Fix WaPo (images)
 Fix WSJ (timing)
+Refactor (custom) site rules
 
 * v2.4.2.0 (2021-10-31)
 Fix Barron's (timing)

custom/manifest.json

@@ -39,5 +39,5 @@
         "webRequestBlocking",
         "<all_urls>"
     ],
-    "version": "2.4.2.3"
+    "version": "2.4.2.4"
 }

manifest.json

@@ -545,5 +545,5 @@
         "*://*.wallkit.net/*",
         "*://*.wsj.net/*"
     ],
-    "version": "2.4.2.3"
+    "version": "2.4.2.4"
 }

options/options.js

@@ -40,7 +40,7 @@ function renderOptions() {
       if (!defaultSites.hasOwnProperty(key)) {
         continue;
       }
-      var value = defaultSites[key];
+      var value = defaultSites[key].domain;
       labelEl = document.createElement('label');
       var inputEl = document.createElement('input');
       inputEl.type = 'checkbox';

options/options_custom.html

@@ -21,7 +21,7 @@
   <div style="width:90%;">
     To add a new site, enter an unique title/domain (without www.).<br>
     Select options for useragent (like Googlebot), set referer (ignored when Googlebot is set), block Javascript (on (sub)domain(s) of site and/or external domains), block regular expression and/or unhide text on amp-page.<br>
-    Custom sites are enabled automatically in <small><button><a href="options.html" style="text-decoration:none;color:inherit">Options</a></button></small> (cookies will be removed by default unless you enable allow_cookies; cookie settings for default sites are ignored).<br>
+    Custom sites (new) are enabled automatically in <small><button><a href="options.html" style="text-decoration:none;color:inherit">Options</a></button></small> (cookies will be removed by default unless you enable allow_cookies).<br>
     If you want to use custom sites (for non-listed sites) enable it in <small><button><a href="optin/opt-in.html" style="text-decoration:none;color:inherit">Opt-in</a></button></small>
     <strong>Custom sites enabled: <span id="custom-enabled"></span></strong><br>
     You can also just request permissions for the custom sites you added yourself (below).