diff --git a/chromium/background-scripts/background.js b/chromium/background-scripts/background.js index 51cca78d0489..cbe1161e4b96 100644 --- a/chromium/background-scripts/background.js +++ b/chromium/background-scripts/background.js @@ -73,6 +73,11 @@ chrome.storage.onChanged.addListener(async function(changes, areaName) { isExtensionEnabled = changes.globalEnabled.newValue; updateState(); } + if ('enableMixedRulesets' in changes) { + // Don't require users to restart the browsers + rules.settings.enableMixedRulesets = changes.enableMixedRulesets.newValue; + initializeAllRules(); + } if ('debugging_rulesets' in changes) { initializeAllRules(); } diff --git a/chromium/pages/options/index.html b/chromium/pages/options/index.html index d8d72dc3fe06..2c417bd46afb 100644 --- a/chromium/pages/options/index.html +++ b/chromium/pages/options/index.html @@ -7,18 +7,24 @@
-
+
- +
-
+
+
+
+ + +
+
-
+
diff --git a/chromium/pages/options/style.css b/chromium/pages/options/style.css index 206ad62ca141..9b570806b276 100644 --- a/chromium/pages/options/style.css +++ b/chromium/pages/options/style.css @@ -6,6 +6,10 @@ margin-bottom: 20px; } +.general-settings-wrapper#mixed-rulesets-wrapper{ + margin-bottom: 20px; +} + .section-header{ margin-bottom: 10px; } diff --git a/chromium/pages/options/ux.js b/chromium/pages/options/ux.js index 29f06fe07886..6c38bd01e7ff 100644 --- a/chromium/pages/options/ux.js +++ b/chromium/pages/options/ux.js @@ -5,19 +5,19 @@ document.addEventListener("DOMContentLoaded", () => { let json_data; - let import_button = document.querySelector("#import"); + let import_button = document.getElementById("import"); function import_json(e) { e.preventDefault(); let settings = JSON.parse(json_data); sendMessage("import_settings", settings, () => { - document.querySelector("#import-confirmed").style.display = "block"; - document.querySelector("form").style.display = "none"; + document.getElementById("import-confirmed").style.display = "block"; + document.getElementById("import-settings-form").style.display = "none"; }); } - document.querySelector("#import-settings").addEventListener("change", () => { + document.getElementById("import-settings").addEventListener("change", () => { const file = event.target.files[0]; const reader = new FileReader(); reader.addEventListener("load", event => { @@ -28,20 +28,34 @@ document.addEventListener("DOMContentLoaded", () => { reader.readAsText(file); }); - document.querySelector("form").addEventListener("submit", import_json); + document.getElementById("import-settings-form").addEventListener("submit", import_json); const showCounter = document.getElementById("showCounter"); const autoUpdateRulesets = document.getElementById("autoUpdateRulesets"); + const enableMixedRulesets = document.getElementById("enableMixedRulesets"); - sendMessage("get_option", { showCounter: true, autoUpdateRulesets: true }, item => { + const defaultOptions = { + showCounter: true, + autoUpdateRulesets: true, + enableMixedRulesets: false, + }; + + sendMessage("get_option", defaultOptions, item => { showCounter.checked = item.showCounter; autoUpdateRulesets.checked = item.autoUpdateRulesets; + enableMixedRulesets.checked = item.enableMixedRulesets; + showCounter.addEventListener("change", () => { sendMessage("set_option", { showCounter: showCounter.checked }); }); + autoUpdateRulesets.addEventListener("change", () => { sendMessage("set_option", { autoUpdateRulesets: autoUpdateRulesets.checked }); }); + + enableMixedRulesets.addEventListener("change", () => { + sendMessage("set_option", { enableMixedRulesets: enableMixedRulesets.checked }); + }) }); document.onkeydown = function(evt) { diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd index c16099cb1891..1a0e5b0a1c8b 100644 --- a/src/chrome/locale/en/https-everywhere.dtd +++ b/src/chrome/locale/en/https-everywhere.dtd @@ -9,12 +9,14 @@ - + + +