diff options
Diffstat (limited to 'src/pages')
| -rw-r--r-- | src/pages/background/background.js | 2 | ||||
| -rw-r--r-- | src/pages/options/widgets/general.js | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 35deb8f9..ad79323f 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -38,11 +38,13 @@ browser.runtime.onInstalled.addListener(details => { await generalHelper.initDefaults() await servicesHelper.initDefaults() await servicesHelper.upgradeOptions() + await servicesHelper.processEnabledInstanceList() } }) break default: await servicesHelper.processUpdate() + await servicesHelper.processEnabledInstanceList() } }) }) diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 164d9b89..bcc9afed 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -31,11 +31,6 @@ async function getConfig() { function setOption(option, type, event) { browser.storage.local.get("options", r => { let options = r.options - browser.storage.local.set({ options }) - }) - - browser.storage.local.get("options", r => { - let options = r.options if (type == "select") { options[option] = event.target.options[event.target.options.selectedIndex].value } else if (type == "checkbox") { @@ -82,13 +77,20 @@ importSettingsElement.addEventListener("change", () => { await generalHelper.initDefaults() await servicesHelper.initDefaults() await servicesHelper.upgradeOptions() + await servicesHelper.processEnabledInstanceList() location.reload() }) }) }) ) - } else if ("version" in data) browser.storage.local.set({ options: data }, () => location.reload()) - else { + } else if ("version" in data) { + let options = data + delete options.version + browser.storage.local.set({ options: data }, async () => { + await servicesHelper.processEnabledInstanceList() + location.reload() + }) + } else { console.log("incompatible settings") importError() } |