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

2 files changed, 49 insertions, 53 deletions

diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html
index 47c0b3b2..9ccc130d 100644
--- a/src/pages/options/reddit/reddit.html
+++ b/src/pages/options/reddit/reddit.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 class="selected" 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>
@@ -67,7 +66,6 @@
       <select id="reddit-frontend">
         <option value="libreddit">Libreddit</option>
         <option value="teddit">Teddit</option>
-        <option value="old">old.reddit.com</option>
       </select>
     </div>
     <div class="some-block option-block">
diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js
index 47bd1856..3f79eeaa 100644
--- a/src/pages/options/reddit/reddit.js
+++ b/src/pages/options/reddit/reddit.js
@@ -45,11 +45,6 @@ document.addEventListener("change", async () => {
     init();
 })
 
-window.onblur = () => {
-    redditHelper.initLibredditCookies();
-    redditHelper.initTedditCookies();
-}
-
 function changeProtocolSettings(protocol) {
     let normalLibredditDiv = libredditDivElement.getElementsByClassName("normal")[0];
     let torLibredditDiv = libredditDivElement.getElementsByClassName("tor")[0];
@@ -91,56 +86,54 @@ function changeFrontendsSettings(frontend) {
         tedditDivElement.style.display = 'none';
     }
 }
-function init() {
-    browser.storage.local.get(
-        [
-            "disableReddit",
-            "bypassWatchOnReddit",
-            "redditProtocol",
-            "redditFrontend",
 
-            "enableLibredditCustomSettings",
+browser.storage.local.get(
+    [
+        "disableReddit",
+        "bypassWatchOnReddit",
+        "redditProtocol",
+        "redditFrontend",
 
-            "redditTheme",
-            "redditFrontPage",
-            "redditLayout",
-            "redditWide",
-            "redditPostSort",
-            "redditCommentSort",
-            "redditShowNsfw",
-            "redditAutoplayVideos",
-            "redditUseHls",
-            "redditHideHlsNotification",
-        ],
-        r => {
-            disableRedditElement.checked = !r.disableReddit
-            bypassWatchOnRedditElement.checked = r.bypassWatchOnReddit
-            protocolElement.value = r.redditProtocol
-            redditFrontendElement.value = r.redditFrontend
-            enableLibredditSettingsElement.checked = r.enableLibredditCustomSettings
-            changeFrontendsSettings(r.redditFrontend);
-            changeProtocolSettings(r.redditProtocol);
+        "enableLibredditCustomSettings",
 
-            theme.value = r.redditTheme;
-            front_page.value = r.redditFrontPage;
-            layout.value = r.redditLayout;
-            wide.checked = r.redditWide;
-            post_sort.value = r.redditPostSort;
-            comment_sort.value = r.redditCommentSort;
-            show_nsfw.checked = r.redditShowNsfw;
-            autoplay_videos.checked = r.redditAutoplayVideos;
-            use_hls.checked = r.redditUseHls;
-            hide_hls_notification.checked = r.redditHideHlsNotification;
-        }
-    )
+        "redditTheme",
+        "redditFrontPage",
+        "redditLayout",
+        "redditWide",
+        "redditPostSort",
+        "redditCommentSort",
+        "redditShowNsfw",
+        "redditAutoplayVideos",
+        "redditUseHls",
+        "redditHideHlsNotification",
+    ],
+    r => {
+        disableRedditElement.checked = !r.disableReddit
+        bypassWatchOnRedditElement.checked = r.bypassWatchOnReddit
+        protocolElement.value = r.redditProtocol
+        redditFrontendElement.value = r.redditFrontend
+        enableLibredditSettingsElement.checked = r.enableLibredditCustomSettings
+        changeFrontendsSettings(r.redditFrontend);
+        changeProtocolSettings(r.redditProtocol);
 
-    commonHelper.processDefaultCustomInstances('libreddit', 'normal', redditHelper, document)
-    commonHelper.processDefaultCustomInstances('libreddit', 'tor', redditHelper, document)
+        theme.value = r.redditTheme;
+        front_page.value = r.redditFrontPage;
+        layout.value = r.redditLayout;
+        wide.checked = r.redditWide;
+        post_sort.value = r.redditPostSort;
+        comment_sort.value = r.redditCommentSort;
+        show_nsfw.checked = r.redditShowNsfw;
+        autoplay_videos.checked = r.redditAutoplayVideos;
+        use_hls.checked = r.redditUseHls;
+        hide_hls_notification.checked = r.redditHideHlsNotification;
+    }
+)
+
+commonHelper.processDefaultCustomInstances('libreddit', 'normal', redditHelper, document)
+commonHelper.processDefaultCustomInstances('libreddit', 'tor', redditHelper, document)
+commonHelper.processDefaultCustomInstances('teddit', 'normal', redditHelper, document);
+commonHelper.processDefaultCustomInstances('teddit', 'tor', redditHelper, document);
 
-    commonHelper.processDefaultCustomInstances('teddit', 'normal', redditHelper, document);
-    commonHelper.processDefaultCustomInstances('teddit', 'tor', redditHelper, document);
-}
-init();
 
 let latencyLibredditElement = document.getElementById("latency-libreddit");
 let latencyLibredditLabel = document.getElementById("latency-libreddit-label");
@@ -178,4 +171,9 @@ latencyTedditElement.addEventListener("click",
             latencyTedditElement.removeEventListener("click", reloadWindow);
         });
     }
-);
\ No newline at end of file
+);
+
+window.onblur = () => {
+    redditHelper.initLibredditCookies();
+    redditHelper.initTedditCookies();
+}
\ No newline at end of file