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

2 files changed, 24 insertions, 66 deletions

diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html
index 246c269b..4d0f08cb 100644
--- a/src/pages/options/wikipedia/wikipedia.html
+++ b/src/pages/options/wikipedia/wikipedia.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 class="selected" href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div>
diff --git a/src/pages/options/wikipedia/wikipedia.js b/src/pages/options/wikipedia/wikipedia.js
index 526068b4..0d9a1a6c 100644
--- a/src/pages/options/wikipedia/wikipedia.js
+++ b/src/pages/options/wikipedia/wikipedia.js
@@ -2,18 +2,27 @@ import wikipediaHelper from "../../../assets/javascripts/helpers/wikipedia.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableWikipediaElement = document.getElementById("disable-wikipedia");
-disableWikipediaElement.addEventListener("change",
-    event => wikipediaHelper.setDisable(!event.target.checked)
-);
-
 let protocolElement = document.getElementById("protocol");
-protocolElement.addEventListener("change",
-    event => {
-        let protocol = event.target.options[protocolElement.selectedIndex].value
-        wikipediaHelper.setProtocol(protocol);
-        changeProtocolSettings(protocol);
+
+browser.storage.local.get(
+    [
+        "disableWikipedia",
+        "wikipediaProtocol",
+    ],
+    r => {
+        disableWikipediaElement.checked = !r.disableWikipedia;
+        protocolElement.value = r.wikipediaProtocol;
+        changeProtocolSettings(r.wikipediaProtocol);
     }
-);
+)
+
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disableWikipedia: !disableWikipediaElement.checked,
+        wikipediaProtocol: protocolElement.value,
+    })
+    changeProtocolSettings(protocolElement.value)
+})
 
 function changeProtocolSettings(protocol) {
     let normalDiv = document.getElementsByClassName("normal")[0];
@@ -35,51 +44,11 @@ function changeProtocolSettings(protocol) {
         i2pDiv.style.display = 'block';
     }
 }
+commonHelper.processDefaultCustomInstances('wikiless', 'normal', wikipediaHelper, document);
+commonHelper.processDefaultCustomInstances('wikiless', 'tor', wikipediaHelper, document)
+commonHelper.processDefaultCustomInstances('wikiless', 'i2p', wikipediaHelper, document)
 
-wikipediaHelper.init().then(() => {
-    disableWikipediaElement.checked = !wikipediaHelper.getDisable();
-
-    let protocol = wikipediaHelper.getProtocol();
-    console.log('protocol', protocol);
-    protocolElement.value = protocol;
-    changeProtocolSettings(protocol);
-
-    browser.storage.local.get("wikilessLatency").then(r => {
-        commonHelper.processDefaultCustomInstances(
-            'wikiless',
-            'normal',
-            wikipediaHelper,
-            document,
-            wikipediaHelper.getWikilessNormalRedirectsChecks,
-            wikipediaHelper.setWikilessNormalRedirectsChecks,
-            wikipediaHelper.getWikilessNormalCustomRedirects,
-            wikipediaHelper.setWikilessNormalCustomRedirects,
-            r.wikilessLatency,
-        );
-    })
-
-    commonHelper.processDefaultCustomInstances(
-        'wikiless',
-        'tor',
-        wikipediaHelper,
-        document,
-        wikipediaHelper.getWikilessTorRedirectsChecks,
-        wikipediaHelper.setWikilessTorRedirectsChecks,
-        wikipediaHelper.getWikilessTorCustomRedirects,
-        wikipediaHelper.setWikilessTorCustomRedirects
-    )
-
-    commonHelper.processDefaultCustomInstances(
-        'wikiless',
-        'i2p',
-        wikipediaHelper,
-        document,
-        wikipediaHelper.getWikilessI2pRedirectsChecks,
-        wikipediaHelper.setWikilessI2pRedirectsChecks,
-        wikipediaHelper.getWikilessI2pCustomRedirects,
-        wikipediaHelper.setWikilessI2pCustomRedirects
-    )
-})
+window.onblur = wikipediaHelper.initWikilessCookies;
 
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
@@ -94,17 +63,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.wikiless.normal).then(r => {
             browser.storage.local.set({ wikilessLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'wikiless',
-                'normal',
-                wikipediaHelper,
-                document,
-                wikipediaHelper.getWikilessNormalRedirectsChecks,
-                wikipediaHelper.setWikilessNormalRedirectsChecks,
-                wikipediaHelper.getWikilessNormalCustomRedirects,
-                wikipediaHelper.setWikilessNormalCustomRedirects,
-                r,
-            )
+            commonHelper.processDefaultCustomInstances('wikiless', 'normal', wikipediaHelper, document)
             latencyElement.removeEventListener("click", reloadWindow)
         });
     }