1 files changed, 21 insertions, 24 deletions
diff --git a/src/pages/options/maps/maps.js b/src/pages/options/maps/maps.js
index 982b7980..3f2df54d 100644
--- a/src/pages/options/maps/maps.js
+++ b/src/pages/options/maps/maps.js
@@ -2,18 +2,15 @@ import mapsHelper from "../../../assets/javascripts/helpers/maps.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableMapsElement = document.getElementById("disable-osm");
-disableMapsElement.addEventListener("change",
-    (event) => mapsHelper.setDisable(!event.target.checked)
-);
-
 let mapsFrontendElement = document.getElementById("maps-frontend");
-mapsFrontendElement.addEventListener("change",
-    event => {
-        let frontend = event.target.options[mapsFrontendElement.selectedIndex].value;
-        mapsHelper.setFrontend(frontend);
-        changeFrontendsSettings(frontend);
-    }
-);
+
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disableMaps: !disableMapsElement.checked,
+        mapsFrontend: mapsFrontendElement.value,
+    })
+    changeFrontendsSettings(mapsFrontendElement.value);
+})
 
 let facilDivElement = document.getElementById("facil")
 function changeFrontendsSettings(frontend) {
@@ -24,18 +21,18 @@ function changeFrontendsSettings(frontend) {
         facilDivElement.style.display = 'none';
     }
 }
-
-mapsHelper.init().then(() => {
-    console.log(mapsHelper.getFacilNormalRedirectsChecks())
-    disableMapsElement.checked = !mapsHelper.getDisable();
-    let frontend = mapsHelper.getFrontend();
-    mapsFrontendElement.value = frontend;
-    changeFrontendsSettings(frontend);
-
-    browser.storage.local.get("facilLatency").then(r => {
-        commonHelper.processDefaultCustomInstances('facil', 'normal', mapsHelper, document, r.facilLatency)
-    })
-})
+browser.storage.local.get(
+    [
+        "disableMaps",
+        "mapsFrontend",
+    ],
+    r => {
+        disableMapsElement.checked = !r.disableMaps;
+        mapsFrontendElement.value = r.mapsFrontend;
+        changeFrontendsSettings(r.mapsFrontend);
+    }
+)
+commonHelper.processDefaultCustomInstances('maps', 'facil', 'normal', document);
 
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
@@ -50,7 +47,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.facil.normal).then(r => {
             browser.storage.local.set({ facilLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances('facil', 'normal', mapsHelper, document);
+            commonHelper.processDefaultCustomInstances('maps', 'facil', 'normal', document);
             latencyElement.removeEventListener("click", reloadWindow);
         });
     }