Преглед на файлове

made the autosave items partially visible in the browser action context menu

Gildas преди 7 години
родител
ревизия
b45c540391
променени са 1 файла, в които са добавени 16 реда и са изтрити 11 реда
  1. 16 11
      extension/ui/bg/ui.js

+ 16 - 11
extension/ui/bg/ui.js

@@ -101,8 +101,9 @@ singlefile.ui = (() => {
 	async function refreshContextMenu() {
 	async function refreshContextMenu() {
 		const config = await singlefile.config.get();
 		const config = await singlefile.config.get();
 		if (BROWSER_MENUS_API_SUPPORTED) {
 		if (BROWSER_MENUS_API_SUPPORTED) {
+			const pageContextsEnabled = ["page", "frame", "image"];
 			const defaultContextsDisabled = ["browser_action"];
 			const defaultContextsDisabled = ["browser_action"];
-			const defaultContextsEnabled = defaultContextsDisabled.concat("page", "frame", "image");
+			const defaultContextsEnabled = defaultContextsDisabled.concat(...pageContextsEnabled);
 			const defaultContexts = config.contextMenuEnabled ? defaultContextsEnabled : defaultContextsDisabled;
 			const defaultContexts = config.contextMenuEnabled ? defaultContextsEnabled : defaultContextsDisabled;
 			await browser.menus.removeAll();
 			await browser.menus.removeAll();
 			browser.menus.create({
 			browser.menus.create({
@@ -110,11 +111,13 @@ singlefile.ui = (() => {
 				contexts: defaultContexts,
 				contexts: defaultContexts,
 				title: DEFAULT_TITLE
 				title: DEFAULT_TITLE
 			});
 			});
-			browser.menus.create({
-				id: "separator-1",
-				contexts: defaultContexts,
-				type: "separator"
-			});
+			if (config.contextMenuEnabled) {
+				browser.menus.create({
+					id: "separator-1",
+					contexts: pageContextsEnabled,
+					type: "separator"
+				});
+			}
 			browser.menus.create({
 			browser.menus.create({
 				id: MENU_ID_SAVE_SELECTED,
 				id: MENU_ID_SAVE_SELECTED,
 				contexts: ["selection"],
 				contexts: ["selection"],
@@ -140,11 +143,13 @@ singlefile.ui = (() => {
 				contexts: defaultContexts,
 				contexts: defaultContexts,
 				title: "Save all tabs"
 				title: "Save all tabs"
 			});
 			});
-			browser.menus.create({
-				id: "separator-2",
-				contexts: defaultContexts,
-				type: "separator"
-			});
+			if (config.contextMenuEnabled) {
+				browser.menus.create({
+					id: "separator-2",
+					contexts: pageContextsEnabled,
+					type: "separator"
+				});
+			}
 			browser.menus.create({
 			browser.menus.create({
 				id: MENU_ID_AUTO_SAVE_DISABLED,
 				id: MENU_ID_AUTO_SAVE_DISABLED,
 				type: "radio",
 				type: "radio",