From a28cccfde07e76d1e70d2acfe1c2222d8b8ae705 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Wed, 4 May 2022 13:59:37 +0300
Subject: Simplified code. Removed pixivMoe, old.reddit.com #239

---
 src/pages/options/speedtest/speedtest.html |  1 -
 src/pages/options/speedtest/speedtest.js   | 76 +++++++++---------------------
 2 files changed, 23 insertions(+), 54 deletions(-)

(limited to 'src/pages/options/speedtest')

diff --git a/src/pages/options/speedtest/speedtest.html b/src/pages/options/speedtest/speedtest.html
index 5ac5cdaa..369d226a 100644
--- a/src/pages/options/speedtest/speedtest.html
+++ b/src/pages/options/speedtest/speedtest.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 class="selected" 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/speedtest/speedtest.js b/src/pages/options/speedtest/speedtest.js
index 077d6440..95fa9fea 100644
--- a/src/pages/options/speedtest/speedtest.js
+++ b/src/pages/options/speedtest/speedtest.js
@@ -2,18 +2,28 @@ import speedtestHelper from "../../../assets/javascripts/helpers/speedtest.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableSpeedtestElement = document.getElementById("disable-speedtest");
-disableSpeedtestElement.addEventListener("change",
-    (event) => speedtestHelper.setDisable(!event.target.checked)
-);
-
 let protocolElement = document.getElementById("protocol")
-protocolElement.addEventListener("change",
-    (event) => {
-        let protocol = event.target.options[protocolElement.selectedIndex].value
-        speedtestHelper.setProtocol(protocol);
-        changeProtocolSettings(protocol);
+
+browser.storage.local.get(
+    [
+        "disableSpeedtest",
+        "speedtestProtocol",
+    ],
+    r => {
+        disableSpeedtestElement.checked = !r.disableSpeedtest;
+
+        protocolElement.value = r.speedtestProtocol;
+        changeProtocolSettings(r.speedtestProtocol);
     }
-);
+)
+
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disableSpeedtest: !disableSpeedtestElement.checked,
+        speedtestProtocol: protocolElement.value,
+    })
+    changeProtocolSettings(protocolElement.value);
+})
 
 function changeProtocolSettings(protocol) {
     let normalDiv = document.getElementsByClassName("normal")[0];
@@ -28,38 +38,8 @@ function changeProtocolSettings(protocol) {
     }
 }
 
-speedtestHelper.init().then(() => {
-    disableSpeedtestElement.checked = !speedtestHelper.getDisable();
-
-    let protocol = speedtestHelper.getProtocol();
-    protocolElement.value = protocol;
-    changeProtocolSettings(protocol);
-
-    browser.storage.local.get("librespeedLatency").then(r => {
-    commonHelper.processDefaultCustomInstances(
-        'librespeed',
-        'normal',
-        speedtestHelper,
-        document,
-        speedtestHelper.getLibrespeedNormalRedirectsChecks,
-        speedtestHelper.setLibrespeedNormalRedirectsChecks,
-        speedtestHelper.getLibrespeedNormalCustomRedirects,
-        speedtestHelper.setLibrespeedNormalCustomRedirects,
-        r.librespeedLatency,
-    );
-    })
-
-    commonHelper.processDefaultCustomInstances(
-        'librespeed',
-        'tor',
-        speedtestHelper,
-        document,
-        speedtestHelper.getLibrespeedTorRedirectsChecks,
-        speedtestHelper.setLibrespeedTorRedirectsChecks,
-        speedtestHelper.getLibrespeedTorCustomRedirects,
-        speedtestHelper.setLibrespeedTorCustomRedirects
-    )
-})
+commonHelper.processDefaultCustomInstances('librespeed', 'normal', speedtestHelper, document);
+commonHelper.processDefaultCustomInstances('librespeed', 'tor', speedtestHelper, document);
 
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
@@ -74,17 +54,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.librespeed.normal).then(r => {
             browser.storage.local.set({ librespeedLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'librespeed',
-                'normal',
-                speedtestHelper,
-                document,
-                speedtestHelper.getLibrespeedNormalRedirectsChecks,
-                speedtestHelper.setLibrespeedNormalRedirectsChecks,
-                speedtestHelper.getLibrespeedNormalCustomRedirects,
-                speedtestHelper.setLibrespeedNormalCustomRedirects,
-                r,
-            )
+            commonHelper.processDefaultCustomInstances('librespeed', 'normal', speedtestHelper, document)
             latencyElement.removeEventListener("click", reloadWindow)
         });
     }
-- 
cgit 1.4.1