Remove option to block about:config

benburrill · Nov 26, 2017 · b49b5ca · b49b5ca
1 parent d7aa88b
commit b49b5ca
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/background.js b/background.js
@@ -201,14 +201,14 @@ function checkTab(id, url, isRepeat) {
 		let allowRE = gOptions[`allowRE${set}`];
 		let keywordRE = gOptions[`keywordRE${set}`];
 
-		// Get options for preventing access to about:addons and about:config
+		// Get options for preventing access to about:addons and about:support
 		let prevAddons = gOptions[`prevAddons${set}`];
-		let prevConfig = gOptions[`prevConfig${set}`];
+		let prevSupport = gOptions[`prevSupport${set}`];
 
 		// Test URL against block/allow regular expressions
 		if (testURL(pageURL, blockRE, allowRE)
 				|| (prevAddons && /^about:addons/i.test(pageURL))
-				|| (prevConfig && /^about:(config|support)/i.test(pageURL))) {
+				|| (prevSupport && /^about:support/i.test(pageURL))) {
 			// Get options for this set
 			let timedata = gOptions[`timedata${set}`];
 			let times = gOptions[`times${set}`];

diff --git a/common.js b/common.js
@@ -66,8 +66,8 @@ function cleanOptions(options) {
 		if (typeof options[`prevAddons${set}`] !== "boolean") {
 			options[`prevAddons${set}`] = false;
 		}
-		if (typeof options[`prevConfig${set}`] !== "boolean") {
-			options[`prevConfig${set}`] = false;
+		if (typeof options[`prevSupport${set}`] !== "boolean") {
+			options[`prevSupport${set}`] = false;
 		}
 		if (typeof options[`blockRE${set}`] !== "string") {
 			options[`blockRE${set}`] = "";

diff --git a/options.html b/options.html
@@ -152,8 +152,8 @@
 								<label for="prevAddons1">Prevent access to about:addons at times when these sites are blocked</label>
 							</p>
 							<p>
-								<input id="prevConfig1" type="checkbox">
-								<label for="prevConfig1">Prevent access to about:config and about:support at times when these sites are blocked</label>
+								<input id="prevSupport1" type="checkbox">
+								<label for="prevSupport1">Prevent access to about:support at times when these sites are blocked</label>
 							</p>
 							<hr>
 							<p>

diff --git a/options.js b/options.js
@@ -79,7 +79,7 @@ function saveOptions() {
 		let delaySecs = document.querySelector(`#delaySecs${set}`).value;
 		let prevOpts = document.querySelector(`#prevOpts${set}`).checked;
 		let prevAddons = document.querySelector(`#prevAddons${set}`).checked;
-		let prevConfig = document.querySelector(`#prevConfig${set}`).checked;
+		let prevSupport = document.querySelector(`#prevSupport${set}`).checked;
 
 		// Get regular expressions to match sites
 		let regexps = getRegExpSites(sites);
@@ -99,7 +99,7 @@ function saveOptions() {
 		options[`delaySecs${set}`] = delaySecs;
 		options[`prevOpts${set}`] = prevOpts;
 		options[`prevAddons${set}`] = prevAddons;
-		options[`prevConfig${set}`] = prevConfig;
+		options[`prevSupport${set}`] = prevSupport;
 		options[`blockRE${set}`] = regexps.block;
 		options[`allowRE${set}`] = regexps.allow;
 		options[`keywordRE${set}`] = regexps.keyword;
@@ -228,7 +228,7 @@ function retrieveOptions() {
 			let delaySecs = options[`delaySecs${set}`];
 			let prevOpts = options[`prevOpts${set}`];
 			let prevAddons = options[`prevAddons${set}`];
-			let prevConfig = options[`prevConfig${set}`];
+			let prevSupport = options[`prevSupport${set}`];
 
 			// Apply custom set name to tab (if specified)
 			if (setName) {
@@ -254,7 +254,7 @@ function retrieveOptions() {
 			document.querySelector(`#delaySecs${set}`).value = delaySecs;
 			document.querySelector(`#prevOpts${set}`).checked = prevOpts;
 			document.querySelector(`#prevAddons${set}`).checked = prevAddons;
-			document.querySelector(`#prevConfig${set}`).checked = prevConfig;
+			document.querySelector(`#prevSupport${set}`).checked = prevSupport;
 		}
 
 		// General options
@@ -349,7 +349,7 @@ function exportOptions() {
 		let delaySecs = document.querySelector(`#delaySecs${set}`).value;
 		let prevOpts = document.querySelector(`#prevOpts${set}`).checked;
 		let prevAddons = document.querySelector(`#prevAddons${set}`).checked;
-		let prevConfig = document.querySelector(`#prevConfig${set}`).checked;
+		let prevSupport = document.querySelector(`#prevSupport${set}`).checked;
 
 		// Set option values
 		options[`setName${set}`] = setName;
@@ -366,7 +366,7 @@ function exportOptions() {
 		options[`delaySecs${set}`] = delaySecs;
 		options[`prevOpts${set}`] = prevOpts;
 		options[`prevAddons${set}`] = prevAddons;
-		options[`prevConfig${set}`] = prevConfig;
+		options[`prevSupport${set}`] = prevSupport;
 	}
 
 	// General options
@@ -440,7 +440,7 @@ function importOptions() {
 			let delaySecs = options[`delaySecs${set}`];
 			let prevOpts = options[`prevOpts${set}`];
 			let prevAddons = options[`prevAddons${set}`];
-			let prevConfig = options[`prevConfig${set}`];
+			let prevSupport = options[`prevSupport${set}`];
 
 			// Set component values
 			if (setName != undefined) {
@@ -535,10 +535,10 @@ function importOptions() {
 					element.checked = isTrue(prevAddons);
 				}
 			}
-			if (prevConfig != undefined) {
-				let element = document.querySelector(`#prevConfig${set}`);
+			if (prevSupport != undefined) {
+				let element = document.querySelector(`#prevSupport${set}`);
 				if (!element.disabled) {
-					element.checked = isTrue(prevConfig);
+					element.checked = isTrue(prevSupport);
 				}
 			}
 		}
@@ -583,7 +583,7 @@ function disableSetOptions(set) {
 		"day0", "day1", "day2", "day3", "day4", "day5", "day6",
 		"blockURL", "defaultPage", "delayingPage", "blankPage", "homePage",
 		"activeBlock", "countFocus", "delayFirst", "delaySecs",
-		"prevOpts", "prevAddons", "prevConfig", "cancelLockdown"
+		"prevOpts", "prevAddons", "prevSupport", "cancelLockdown"
 	];
 	for (let item of items) {
 		let element = document.querySelector(`#${item}${set}`);