extension: Change from switch/toggle to proper boolean for tab reload

ruffle-rs · Jul 17, 2024 · ecc3cc4 · ecc3cc4
1 parent 95ac802
commit ecc3cc4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/web/packages/extension/src/background.ts b/web/packages/extension/src/background.ts
@@ -65,9 +65,8 @@ async function onAdded(permissions: chrome.permissions.Permissions) {
         permissions.origins.length >= 1 &&
         permissions.origins[0] !== "<all_urls>"
     ) {
-        const { permissionsSwitch } = await utils.getOptions();
-        utils.storage.sync.set({
-            ["permissionsSwitch"]: !permissionsSwitch,
+        await utils.storage.sync.set({
+            ["showReloadButton"]: true,
         });
     }
 }

diff --git a/web/packages/extension/src/common.ts b/web/packages/extension/src/common.ts
@@ -5,7 +5,7 @@ export interface Options extends BaseLoadOptions {
     ruffleEnable: boolean;
     ignoreOptout: boolean;
     autostart: boolean;
-    permissionsSwitch: boolean;
+    showReloadButton: boolean;
 }
 
 interface OptionElement<T> {

diff --git a/web/packages/extension/src/content.ts b/web/packages/extension/src/content.ts
@@ -119,6 +119,9 @@ function isXMLDocument(): boolean {
 }
 
 (async () => {
+    await utils.storage.sync.set({
+        ["showReloadButton"]: false,
+    });
     const options = await utils.getOptions();
     const explicitOptions = await utils.getExplicitOptions();
 

diff --git a/web/packages/extension/src/popup.ts b/web/packages/extension/src/popup.ts
@@ -142,8 +142,9 @@ function optionsChanged() {
         return;
     }
 
-    const isDifferent = !deepEqual(savedOptions, tabOptions);
-    reloadButton.disabled = !isDifferent;
+    const showReloadButton = tabOptions.showReloadButton;
+    const notDifferent = deepEqual(savedOptions, tabOptions);
+    reloadButton.disabled = notDifferent && !showReloadButton;
 }
 
 async function displayTabStatus() {

diff --git a/web/packages/extension/src/utils.ts b/web/packages/extension/src/utils.ts
@@ -6,7 +6,7 @@ const DEFAULT_OPTIONS: Required<Options> = {
     ruffleEnable: true,
     ignoreOptout: false,
     autostart: false,
-    permissionsSwitch: false,
+    showReloadButton: false,
 };
 
 export let i18n: typeof browser.i18n | typeof chrome.i18n;