Simplified code. Removed pixivMoe, old.reddit.com #239

2 files changed, 24 insertions, 56 deletions

diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html
index 303524f7..e7c0a336 100644
--- a/src/pages/options/medium/medium.html
+++ b/src/pages/options/medium/medium.html
@@ -23,7 +23,6 @@
       <div class="title"> <img src="../../../assets/images/tiktok-icon.png"><a href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a></div>
       <div class="title"> <img src="../../../assets/images/reddit-icon.png"><a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a></div>
       <div class="title"> <img src="../../../assets/images/imgur-icon.png"><a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a></div>
-      <div class="title"> <img src="../../../assets/images/pixiv-icon.svg"><a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a></div>
       <div class="title"> <img src="../../../assets/images/librespeed-icon.svg"><a href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__">Speedtest</a></div>
       <div class="title"> <img src="../../../assets/images/spotify-icon.png"><a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a></div>
       <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div>
diff --git a/src/pages/options/medium/medium.js b/src/pages/options/medium/medium.js
index d79c1de5..4fb04092 100644
--- a/src/pages/options/medium/medium.js
+++ b/src/pages/options/medium/medium.js
@@ -2,18 +2,32 @@ import mediumHelper from "../../../assets/javascripts/helpers/medium.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableMediumElement = document.getElementById("disable-medium");
-disableMediumElement.addEventListener("change",
-    (event) => mediumHelper.setDisable(!event.target.checked)
-);
-
 let protocolElement = document.getElementById("protocol")
-protocolElement.addEventListener("change",
-    (event) => {
-        let protocol = event.target.options[protocolElement.selectedIndex].value
-        mediumHelper.setProtocol(protocol);
+
+browser.storage.local.get(
+    [
+        "disableMedium",
+        "mediumProtocol"
+    ],
+    r => {
+        disableMediumElement.checked = !r.disableMedium;
+
+        let protocol = r.mediumProtocol;
+        protocolElement.value = protocol;
         changeProtocolSettings(protocol);
+
+        commonHelper.processDefaultCustomInstances('scribe', 'normal', mediumHelper, document)
+        commonHelper.processDefaultCustomInstances('scribe', 'tor', mediumHelper, document)
     }
-);
+)
+
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disableMedium: !disableMediumElement.checked,
+        mediumProtocol: protocolElement.value,
+    })
+    changeProtocolSettings(protocolElement.value);
+})
 
 function changeProtocolSettings(protocol) {
     let normalDiv = document.getElementsByClassName("normal")[0];
@@ -28,41 +42,6 @@ function changeProtocolSettings(protocol) {
     }
 }
 
-
-mediumHelper.init().then(() => {
-    disableMediumElement.checked = !mediumHelper.getDisable();
-
-    let protocol = mediumHelper.getProtocol();
-    protocolElement.value = protocol;
-    changeProtocolSettings(protocol);
-
-
-    browser.storage.local.get("scribeLatency").then(r => {
-        commonHelper.processDefaultCustomInstances(
-            'scribe',
-            'normal',
-            mediumHelper,
-            document,
-            mediumHelper.getScribeNormalRedirectsChecks,
-            mediumHelper.setScribeNormalRedirectsChecks,
-            mediumHelper.getScribeNormalCustomRedirects,
-            mediumHelper.setScribeNormalCustomRedirects,
-            r.scribeLatency,
-        )
-    })
-
-    commonHelper.processDefaultCustomInstances(
-        'scribe',
-        'tor',
-        mediumHelper,
-        document,
-        mediumHelper.getScribeTorRedirectsChecks,
-        mediumHelper.setScribeTorRedirectsChecks,
-        mediumHelper.getScribeTorCustomRedirects,
-        mediumHelper.setScribeTorCustomRedirects
-    )
-})
-
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
 latencyElement.addEventListener("click",
@@ -76,17 +55,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.scribe.normal).then(r => {
             browser.storage.local.set({ scribeLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'scribe',
-                'normal',
-                mediumHelper,
-                document,
-                mediumHelper.getScribeNormalRedirectsChecks,
-                mediumHelper.setScribeNormalRedirectsChecks,
-                mediumHelper.getScribeNormalCustomRedirects,
-                mediumHelper.setScribeNormalCustomRedirects,
-                r,
-            );
+            commonHelper.processDefaultCustomInstances('scribe', 'normal', mediumHelper, document);
             latencyElement.removeEventListener("click", reloadWindow);
         });
     }