Add option to show/hide tools menu

background.js

@@ -23,38 +23,39 @@ function refreshMenus() {
 	browser.menus.removeAll();
 
 	let context = gOptions["contextMenu"] ? "all" : "browser_action";
+	let contexts = gOptions["toolsMenu"] ? [context, "tools_menu"] : [context];
 
 	// Options
 	browser.menus.create({
 		id: "options",
 		title: "Options",
-		contexts: [context, "tools_menu"]
+		contexts: contexts
 	});
 
 	// Lockdown
 	browser.menus.create({
 		id: "lockdown",
 		title: "Lockdown",
-		contexts: [context, "tools_menu"]
+		contexts: contexts
 	});
 
 	// Statistics
 	browser.menus.create({
 		id: "stats",
 		title: "Statistics",
-		contexts: [context, "tools_menu"]
+		contexts: contexts
 	});
 
 	browser.menus.create({
 		type: "separator",
-		contexts: [context]
+		contexts: [context] // never in tools menu
 	});
 
 	// Add Site
 	browser.menus.create({
 		id: "addSite",
 		title: "Add Site",
-		contexts: [context]
+		contexts: [context] // never in tools menu
 	});
 
 	// Add Site submenu
@@ -68,7 +69,7 @@ function refreshMenus() {
 			id: `addSite-${set}`,
 			parentId: "addSite",
 			title: title,
-			contexts: [context, "tools_menu"]
+			contexts: contexts
 		});
 	}
 }

common.js

@@ -129,11 +129,14 @@ function cleanOptions(options) {
 		options["warnSecs"] = ""; // default: no warning
 	}
 	if (typeof options["warnImmediate"] !== "boolean") {
-		options["warnImmediate"] = true; // default: warn only when for immediate block
+		options["warnImmediate"] = true; // default: warn only for immediate block
 	}
 	if (typeof options["contextMenu"] !== "boolean") {
 		options["contextMenu"] = true; // default: enabled
 	}
+	if (typeof options["toolsMenu"] !== "boolean") {
+		options["toolsMenu"] = true; // default: enabled
+	}
 	if (typeof options["matchSubdomains"] !== "boolean") {
 		options["matchSubdomains"] = false; // default: disabled for backwards compatibility
 	}

options.html

@@ -254,6 +254,9 @@
 							<p>
 								<input id="contextMenu" type="checkbox">
 								<label for="contextMenu">Show context menu</label>
+								&nbsp;&nbsp;&nbsp;&nbsp;
+								<input id="toolsMenu" type="checkbox">
+								<label for="toolsMenu">Show tools menu</label>
 							</p>
 							<p>
 								<input id="matchSubdomains" type="checkbox">

options.js

@@ -75,6 +75,7 @@ function saveOptions() {
 	options["warnSecs"] = getElement("warnSecs").value;
 	options["warnImmediate"] = getElement("warnImmediate").checked;
 	options["contextMenu"] = getElement("contextMenu").checked;
+	options["toolsMenu"] = getElement("toolsMenu").checked;
 	options["matchSubdomains"] = getElement("matchSubdomains").checked;
 
 	for (let set = 1; set <= NUM_SETS; set++) {
@@ -305,6 +306,7 @@ function retrieveOptions() {
 		getElement("warnSecs").value = options["warnSecs"];
 		getElement("warnImmediate").checked = options["warnImmediate"];
 		getElement("contextMenu").checked = options["contextMenu"];
+		getElement("toolsMenu").checked = options["toolsMenu"];
 		getElement("matchSubdomains").checked = options["matchSubdomains"];
 
 		confirmAccess(options);
@@ -430,6 +432,7 @@ function exportOptions() {
 	options["warnSecs"] = getElement("warnSecs").value;
 	options["warnImmediate"] = getElement("warnImmediate").checked;
 	options["contextMenu"] = getElement("contextMenu").checked;
+	options["toolsMenu"] = getElement("toolsMenu").checked;
 	options["matchSubdomins"] = getElement("matchSubdomains").checked;
 
 	// Convert options to text lines
@@ -643,6 +646,7 @@ function importOptions() {
 		let warnSecs = options["warnSecs"];
 		let warnImmediate = options["warnImmediate"];
 		let contextMenu = options["contextMenu"];
+		let toolsMenu = options["toolsMenu"];
 		let matchSubdomains = options["matchSubdomains"]
 		if (oa != undefined) {
 			getElement("optionsAccess").value = oa;
@@ -674,6 +678,9 @@ function importOptions() {
 		if (contextMenu != undefined) {
 			getElement("contextMenu").checked = contextMenu;
 		}
+		if (toolsMenu != undefined) {
+			getElement("toolsMenu").checked = toolsMenu;
+		}
 		if (matchSubdomains != undefined) {
 			getElement("matchSubdomains").checked = matchSubdomains;
 		}