aboutsummaryrefslogtreecommitdiffstats
path: root/src/pages/options/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/pages/options/widgets')
-rw-r--r--src/pages/options/widgets/general.js17
-rw-r--r--src/pages/options/widgets/services.pug7
2 files changed, 12 insertions, 12 deletions
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index 63938d78..f08d8313 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -57,19 +57,16 @@ importSettingsElement.addEventListener("change", () => {
reader.readAsText(file)
reader.onload = async () => {
const data = JSON.parse(reader.result)
- if ("theme" in data && "disableImgur" in data && "imgurRedirects" in data) {
+ if (
+ "theme" in data
+ && data.version == browser.runtime.getManifest().version
+ ) {
browser.storage.local.clear(async () => {
await generalHelper.initDefaults()
await servicesHelper.initDefaults()
- await servicesHelper.upgradeOptions()
- location.reload()
- })
- } else if ("version" in data) {
- let options = data
- delete options.version
- browser.storage.local.set({ options: data }, async () => {
- await servicesHelper.processUpdate()
- location.reload()
+ browser.storage.local.set({ options: data }, () => {
+ location.reload()
+ })
})
} else {
console.log("incompatible settings")
diff --git a/src/pages/options/widgets/services.pug b/src/pages/options/widgets/services.pug
index 22b8ab2d..5bda5d3f 100644
--- a/src/pages/options/widgets/services.pug
+++ b/src/pages/options/widgets/services.pug
@@ -49,7 +49,10 @@ each val, service in services
svg(xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor")
path(d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z")
- div(class="checklist custom-checklist")
+ div(class="checklist custom-checklist")
+
each val, network in networks
div(class=network)
- div(class="checklist") \ No newline at end of file
+ div(class="checklist")
+ if (network == 'clearnet')
+ div(class="some-block option-block") Loading... \ No newline at end of file