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/youtubeMusic/youtubeMusic.html |  1 -
 src/pages/options/youtubeMusic/youtubeMusic.js   | 44 ++++++++----------------
 2 files changed, 15 insertions(+), 30 deletions(-)

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

diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html
index 9286ed64..5a93bffc 100644
--- a/src/pages/options/youtubeMusic/youtubeMusic.html
+++ b/src/pages/options/youtubeMusic/youtubeMusic.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/youtubeMusic/youtubeMusic.js b/src/pages/options/youtubeMusic/youtubeMusic.js
index 98d8b9a0..54a6f8d6 100644
--- a/src/pages/options/youtubeMusic/youtubeMusic.js
+++ b/src/pages/options/youtubeMusic/youtubeMusic.js
@@ -2,27 +2,23 @@ import youtubeMusicHelper from "../../../assets/javascripts/helpers/youtubeMusic
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableYoutubeMusicElement = document.getElementById("disable-beatbump");
-disableYoutubeMusicElement.addEventListener("change",
-    (event) => youtubeMusicHelper.setDisable(!event.target.checked)
-);
 
-youtubeMusicHelper.init().then(() => {
-    disableYoutubeMusicElement.checked = !youtubeMusicHelper.getDisable();
+browser.storage.local.get(
+    [
+        "disableYoutubeMusic",
+    ],
+    r => {
+        disableYoutubeMusicElement.checked = !r.disableYoutubeMusic;
+    }
+);
 
-    browser.storage.local.get("beatbumpLatency").then(r => {
-        commonHelper.processDefaultCustomInstances(
-            'beatbump',
-            'normal',
-            youtubeMusicHelper,
-            document,
-            youtubeMusicHelper.getBeatbumpNormalRedirectsChecks,
-            youtubeMusicHelper.setBeatbumpNormalRedirectsChecks,
-            youtubeMusicHelper.getBeatbumpNormalCustomRedirects,
-            youtubeMusicHelper.setBeatbumpNormalCustomRedirects,
-            r.beatbumpLatency,
-        );
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disableYoutubeMusic: !disableYoutubeMusicElement.checked,
     })
-});
+})
+
+commonHelper.processDefaultCustomInstances('beatbump', 'normal', youtubeMusicHelper, document);
 
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
@@ -37,17 +33,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.beatbump.normal).then(r => {
             browser.storage.local.set({ beatbumpLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'beatbump',
-                'normal',
-                youtubeMusicHelper,
-                document,
-                youtubeMusicHelper.getBeatbumpNormalRedirectsChecks,
-                youtubeMusicHelper.setBeatbumpNormalRedirectsChecks,
-                youtubeMusicHelper.getBeatbumpNormalCustomRedirects,
-                youtubeMusicHelper.setBeatbumpNormalCustomRedirects,
-                r,
-            )
+            commonHelper.processDefaultCustomInstances('beatbump', 'normal', youtubeMusicHelper, document)
             latencyElement.removeEventListener("click", reloadWindow)
         });
     }
-- 
cgit 1.4.1