Cleaning and refining settings

author: ManeraKai <manerakai@protonmail.com> 2022-02-04 18:48:24 +0300
committer: ManeraKai <manerakai@protonmail.com> 2022-02-04 18:48:24 +0300
commit: a9f95b3d1de44edf205508233a3526246842bbf3 (patch)
tree: a273532e131ae36cee2a200c953d015c3fa36bff /src/pages
parent: Added Piped, cleaned code (diff)
download: libredirect-a9f95b3d1de44edf205508233a3526246842bbf3.zip
23 files changed, 231 insertions, 237 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index caa7444d..30d7ae32 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import youtubeHelper from "../../assets/javascripts/helpers/youtube.js";
+import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js";
 import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
 import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
 import redditHelper from "../../assets/javascripts/helpers/reddit.js";
@@ -75,6 +75,13 @@ browser.tabs.onUpdated.addListener((tabId, changeInfo, _) => {
     return;
   }
   var protocolHost = `${url.protocol}//${url.host}`;
+
+
+  if (youtubeHelper.getRedirects().invidious.normal.includes(protocolHost)) {
+    if (youtubeHelper.getPersistInvidiousPrefs())
+      youtubeHelper.invidiousInitCookies(tabId);
+  }
+
   var mightyList = [];
   mightyList.push(
     ...youtubeHelper.getRedirects().invidious.normal,
diff --git a/src/pages/options/general.html b/src/pages/options/general/general.html
index 507e65c3..8c46c40b 100644
--- a/src/pages/options/general.html
+++ b/src/pages/options/general/general.html
@@ -4,23 +4,23 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link href="../stylesheets/styles.css" rel="stylesheet" />
+  <link href="../../stylesheets/styles.css" rel="stylesheet" />
   <title>LibRedirect Options</title>
 </head>
 
 <body class="option">
 
   <section class="links">
-    <a href="general.html" class="selected">General</a>
-    <a href="youtube.html">Youtube</a>
-    <a href="twitter.html">Twitter</a>
-    <a href="instagram.html">Instagram</a>
-    <a href="reddit.html">Reddit</a>
-    <a href="search.html">Search</a>
-    <a href="translate.html">Translate</a>
-    <a href="maps.html">Maps</a>
-    <a href="wikipedia.html" >Wikipedia</a>
-    <a href="medium.html">Medium</a>
+    <a href="./general.html" class="selected">General</a>
+    <a href="../youtube/youtube.html">Youtube</a>
+    <a href="../twitter/twitter.html">Twitter</a>
+    <a href="../instagram/instagram.html">Instagram</a>
+    <a href="../reddit/reddit.html">Reddit</a>
+    <a href="../search/search.html">Search</a>
+    <a href="../translate/translate.html">Translate</a>
+    <a href="../maps/maps.html">Maps</a>
+    <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+    <a href="../medium/medium.html">Medium</a>
   </section>
 
 
@@ -99,8 +99,8 @@
 
 
   <script type="module" src="./general.js"></script>
-  <script type="module" src="./init.js"></script>
-  <script src="../../assets/javascripts/localise.js"></script>
+  <script type="module" src="../init.js"></script>
+  <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/general.js b/src/pages/options/general/general.js
index 1104ba16..4f111469 100644
--- a/src/pages/options/general.js
+++ b/src/pages/options/general/general.js
@@ -1,9 +1,9 @@
 "use strict";
 
-import data from "../../assets/javascripts/data.js";
-import commonHelper from "../../assets/javascripts/helpers/common.js";
+import data from "../../../assets/javascripts/data.js";
+import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
-import shared from "./shared.js";
+import shared from "../shared.js";
 
 const domparser = new DOMParser();
 
diff --git a/src/pages/options/instagram.html b/src/pages/options/instagram/instagram.html
index 25cfc8f2..dfbbd7f7 100644
--- a/src/pages/options/instagram.html
+++ b/src/pages/options/instagram/instagram.html
@@ -5,22 +5,22 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
 </head>
 
 <body class="option">
 
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
         <a href="instagram.html" class="selected">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
     <section class="option-block">
@@ -46,9 +46,9 @@
 
 
     </section>
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./instagram.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/instagram.js b/src/pages/options/instagram/instagram.js
index b4e57def..c5aad9c2 100644
--- a/src/pages/options/instagram.js
+++ b/src/pages/options/instagram/instagram.js
@@ -1,11 +1,10 @@
-import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
+import instagramHelper from "../../../assets/javascripts/helpers/instagram.js";
 
 let disableInstagramElement = document.getElementById("disable-bibliogram");
+disableInstagramElement.addEventListener("change",
+    (event) => instagramHelper.setDisableInstagram(!event.target.checked)
+);
 
 instagramHelper.init().then(() => {
     disableInstagramElement.checked = !instagramHelper.getDisableInstagram();
-})
-
-disableInstagramElement.addEventListener("change",
-    (event) => instagramHelper.setDisableInstagram(!event.target.checked)
-);
-\ No newline at end of file
+})
+\ No newline at end of file
diff --git a/src/pages/options/maps.html b/src/pages/options/maps/maps.html
index bfcedbaf..7702d019 100644
--- a/src/pages/options/maps.html
+++ b/src/pages/options/maps/maps.html
@@ -5,23 +5,23 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
 
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
         <a href="maps.html" class="selected">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
     <section class="option-block">
@@ -36,9 +36,9 @@
             </div>
         </div> -->
     </section>
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./maps.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/maps.js b/src/pages/options/maps/maps.js
index 9e5bb2cc..edb1cca3 100644
--- a/src/pages/options/maps.js
+++ b/src/pages/options/maps/maps.js
@@ -1,11 +1,10 @@
-import mapsHelper from "../../assets/javascripts/helpers/maps.js";
+import mapsHelper from "../../../assets/javascripts/helpers/maps.js";
 
 let disableMapsElement = document.getElementById("disable-osm");
+disableMapsElement.addEventListener("change",
+    (event) => mapsHelper.setDisableMaps(!event.target.checked)
+);
 
 mapsHelper.init().then(() => {
     disableMapsElement.checked = !mapsHelper.getDisableMaps();
-})
-
-disableMapsElement.addEventListener("change",
-    (event) => mapsHelper.setDisableMaps(!event.target.checked)
-);
-\ No newline at end of file
+})
+\ No newline at end of file
diff --git a/src/pages/options/medium.html b/src/pages/options/medium/medium.html
index fb44b7ee..877d704e 100644
--- a/src/pages/options/medium.html
+++ b/src/pages/options/medium/medium.html
@@ -5,21 +5,21 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
         <a href="medium.html" class="selected">Medium</a>
     </section>
 
@@ -45,9 +45,9 @@
         </section> -->
     </section>
 
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./medium.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/medium.js b/src/pages/options/medium/medium.js
index 4f0377f5..fea66855 100644
--- a/src/pages/options/medium.js
+++ b/src/pages/options/medium/medium.js
@@ -1,11 +1,10 @@
-import mediumHelper from "../../assets/javascripts/helpers/medium.js";
+import mediumHelper from "../../../assets/javascripts/helpers/medium.js";
 
 let disableMediumElement = document.getElementById("disable-scribe");
-
-mediumHelper.init().then(() => {
-    disableMediumElement.checked = !mediumHelper.getDisableMedium();
-})
-
 disableMediumElement.addEventListener("change",
     (event) => mediumHelper.setDisableMedium(!event.target.checked)
 );
+
+mediumHelper.init().then(() => {
+    disableMediumElement.checked = !mediumHelper.getDisableMedium();
+})
+\ No newline at end of file
diff --git a/src/pages/options/reddit.html b/src/pages/options/reddit/reddit.html
index 14474285..b3f9c7c7 100644
--- a/src/pages/options/reddit.html
+++ b/src/pages/options/reddit/reddit.html
@@ -5,22 +5,22 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
         <a href="reddit.html" class="selected">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
 
@@ -64,9 +64,9 @@
 
     </section>
 
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./reddit.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/reddit.js b/src/pages/options/reddit/reddit.js
index 0222c6dd..92bd6e46 100644
--- a/src/pages/options/reddit.js
+++ b/src/pages/options/reddit/reddit.js
@@ -1,17 +1,16 @@
-import redditHelper from "../../assets/javascripts/helpers/reddit.js";
+import redditHelper from "../../../assets/javascripts/helpers/reddit.js";
 
 let disableRedditElement = document.getElementById("disable-reddit");
-let redditFrontendElement = document.getElementById("reddit-frontend");
-
-redditHelper.init().then(() => {
-    disableRedditElement.checked = !redditHelper.getDisableReddit();
-    redditFrontendElement.value = redditHelper.getRedditFrontend();
-})
-
 disableRedditElement.addEventListener("change",
     (event) => redditHelper.setDisableReddit(!event.target.checked)
 );
 
+let redditFrontendElement = document.getElementById("reddit-frontend");
 redditFrontendElement.addEventListener("change",
     (event) => redditHelper.setRedditFrontend(event.target.options[redditFrontendElement.selectedIndex].value)
-);
-\ No newline at end of file
+);
+
+redditHelper.init().then(() => {
+    disableRedditElement.checked = !redditHelper.getDisableReddit();
+    redditFrontendElement.value = redditHelper.getRedditFrontend();
+})
+\ No newline at end of file
diff --git a/src/pages/options/search.html b/src/pages/options/search/search.html
index d0510eed..863a3472 100644
--- a/src/pages/options/search.html
+++ b/src/pages/options/search/search.html
@@ -5,22 +5,22 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
         <a href="search.html" class="selected">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
     <section class="option-block">
@@ -64,10 +64,10 @@
     </section>
 
 
-    <script type="module" src="./init.js"></script>
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./search.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/search.js b/src/pages/options/search/search.js
index 2029392c..e38480e2 100644
--- a/src/pages/options/search.js
+++ b/src/pages/options/search/search.js
@@ -1,17 +1,16 @@
-import searchHelper from "../../assets/javascripts/helpers/search.js";
+import searchHelper from "../../../assets/javascripts/helpers/search.js";
 
-let disableSearchElement = document.getElementById("disable-search");
 let searchFrontendElement = document.getElementById("search-frontend");
-
-searchHelper.init().then(() => {
-  disableSearchElement.checked = !searchHelper.getDisableSearch();
-  searchFrontendElement.value = searchHelper.getSearchFrontend();
-});
-
 searchFrontendElement.addEventListener("change",
   (event) => searchHelper.setSearchFrontend(event.target.options[searchFrontendElement.selectedIndex].value)
 );
 
+let disableSearchElement = document.getElementById("disable-search");
 disableSearchElement.addEventListener("change",
   (event) => searchHelper.setDisableSearch(!event.target.checked)
 );
+
+searchHelper.init().then(() => {
+  disableSearchElement.checked = !searchHelper.getDisableSearch();
+  searchFrontendElement.value = searchHelper.getSearchFrontend();
+});
diff --git a/src/pages/options/shared.js b/src/pages/options/shared.js
index 62da2504..36f2ef27 100644
--- a/src/pages/options/shared.js
+++ b/src/pages/options/shared.js
@@ -107,7 +107,6 @@ function autocomplete(input, list) {
     });
 }
 
-
 export default {
     autocompletes,
     parseURL,
diff --git a/src/pages/options/translate.html b/src/pages/options/translate/translate.html
index b193130a..3b6d7580 100644
--- a/src/pages/options/translate.html
+++ b/src/pages/options/translate/translate.html
@@ -5,22 +5,22 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
         <a href="translate.html" class="selected">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
     <section class="option-block">
         <div class="some-block option-block">
@@ -43,9 +43,9 @@
         </div>
     </section>
 
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./translate.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/translate.js b/src/pages/options/translate/translate.js
index 84a12ab0..480b754e 100644
--- a/src/pages/options/translate.js
+++ b/src/pages/options/translate/translate.js
@@ -1,18 +1,16 @@
-import translateHelper from "../../assets/javascripts/helpers/translate.js";
+import translateHelper from "../../../assets/javascripts/helpers/translate.js";
 
 let disableTranslateElement = document.getElementById("disable-simplyTranslate");
-let translateFrontendElement = document.getElementById("translate-frontend");
-
-
-translateHelper.init().then(() => {
-    disableTranslateElement.checked = !translateHelper.getDisableTranslate();
-    translateFrontendElement.value = translateHelper.getFrontend();
-});
-
 disableTranslateElement.addEventListener("change",
     (event) => translateHelper.setDisableTranslate(!event.target.checked)
 );
 
+let translateFrontendElement = document.getElementById("translate-frontend");
 translateFrontendElement.addEventListener("change",
     (event) => translateHelper.setFrontend(event.target.options[translateFrontendElement.selectedIndex].value)
 );
+
+translateHelper.init().then(() => {
+    disableTranslateElement.checked = !translateHelper.getDisableTranslate();
+    translateFrontendElement.value = translateHelper.getFrontend();
+});
+\ No newline at end of file
diff --git a/src/pages/options/twitter.html b/src/pages/options/twitter/twitter.html
index 555b3f64..b695a8b2 100644
--- a/src/pages/options/twitter.html
+++ b/src/pages/options/twitter/twitter.html
@@ -5,23 +5,23 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
 
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
         <a href="twitter.html" class="selected">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
     <section class="option-block">
@@ -53,9 +53,9 @@
 
     </section>
 
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./twitter.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/twitter.js b/src/pages/options/twitter/twitter.js
index f8fdd8ce..08fabb20 100644
--- a/src/pages/options/twitter.js
+++ b/src/pages/options/twitter/twitter.js
@@ -1,17 +1,16 @@
-import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
+import twitterHelper from "../../../assets/javascripts/helpers/twitter.js";
 
-let removeTwitterSWElement = document.getElementById("remove-twitter-sw");
 let disableTwitterElement = document.getElementById("disable-nitter");
-
-twitterHelper.init().then(() => {
-    disableTwitterElement.checked = !twitterHelper.getDisableTwitter();
-    removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem
-});
-
 disableTwitterElement.addEventListener("change",
     (event) => twitterHelper.setDisableTwitter(!event.target.checked)
 );
 
+let removeTwitterSWElement = document.getElementById("remove-twitter-sw");
 removeTwitterSWElement.addEventListener("change", (event) => {
     browser.storage.sync.set({ removeTwitterSW: !event.target.checked }); // Problem
 });
+
+twitterHelper.init().then(() => {
+    disableTwitterElement.checked = !twitterHelper.getDisableTwitter();
+    removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem
+});
+\ No newline at end of file
diff --git a/src/pages/options/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html
index d3cc5cb2..1a4ea8d5 100644
--- a/src/pages/options/wikipedia.html
+++ b/src/pages/options/wikipedia/wikipedia.html
@@ -5,22 +5,22 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
     <section class="links">
-        <a href="general.html">General</a>
-        <a href="youtube.html">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html" class="selected">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../general/general.html">General</a>
+        <a href="../youtube/youtube.html">Youtube</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html" class="selected">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
     <section class="option-block">
@@ -44,9 +44,9 @@
         </section> -->
     </section>
 
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./wikipedia.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/wikipedia.js b/src/pages/options/wikipedia/wikipedia.js
index 95ef6406..08a9a6e0 100644
--- a/src/pages/options/wikipedia.js
+++ b/src/pages/options/wikipedia/wikipedia.js
@@ -1,11 +1,10 @@
-import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
+import wikipediaHelper from "../../../assets/javascripts/helpers/wikipedia.js";
 
 let disableWikipediaElement = document.getElementById("disable-wikipedia");
+disableWikipediaElement.addEventListener("change",
+    (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked)
+);
 
 wikipediaHelper.init().then(() => {
     disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia();
-})
-
-disableWikipediaElement.addEventListener("change",
-    (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked)
-);
-\ No newline at end of file
+})
+\ No newline at end of file
diff --git a/src/pages/options/youtube.html b/src/pages/options/youtube/youtube.html
index c1bd830e..15688873 100644
--- a/src/pages/options/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -5,23 +5,23 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="../stylesheets/styles.css" rel="stylesheet" />
+    <link href="../../stylesheets/styles.css" rel="stylesheet" />
     <title>LibRedirect Options: Twitter</title>
 </head>
 
 <body class="option">
 
     <section class="links">
-        <a href="general.html">General</a>
+        <a href="../general/general.html">General</a>
         <a href="youtube.html" class="selected">Youtube</a>
-        <a href="twitter.html">Twitter</a>
-        <a href="instagram.html">Instagram</a>
-        <a href="reddit.html">Reddit</a>
-        <a href="search.html">Search</a>
-        <a href="translate.html">Translate</a>
-        <a href="maps.html">Maps</a>
-        <a href="wikipedia.html">Wikipedia</a>
-        <a href="medium.html">Medium</a>
+        <a href="../twitter/twitter.html">Twitter</a>
+        <a href="../instagram/instagram.html">Instagram</a>
+        <a href="../reddit/reddit.html">Reddit</a>
+        <a href="../search/search.html">Search</a>
+        <a href="../translate/translate.html">Translate</a>
+        <a href="../maps/maps.html">Maps</a>
+        <a href="../wikipedia/wikipedia.html">Wikipedia</a>
+        <a href="../medium/medium.html">Medium</a>
     </section>
 
     <section class="option-block">
@@ -52,6 +52,7 @@
             <select id="youtube-frontend">
                 <option value="piped">Piped</option>
                 <option value="invidious">Invidious</option>
+                <option value="freeTube">FreeTube</option>
             </select>
         </div>
 
@@ -77,11 +78,6 @@
             </div>
 
             <div class="some-block option-block">
-                <h4 data-localise="__MSG_useFreeTube__">Use FreeTube over Invidious when possible</h4>
-                <input id="use-freetube" type="checkbox" checked />
-            </div>
-
-            <div class="some-block option-block">
                 <h4 data-localise="__MSG_invidiousAlwaysProxy__">Always proxy videos through Invidious</h4>
                 <input id="always-proxy" type="checkbox" checked />
             </div>
@@ -122,9 +118,9 @@
 
     </section>
 
-    <script type="module" src="./init.js"></script>
+    <script type="module" src="../init.js"></script>
     <script type="module" src="./youtube.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
 </html>
 \ No newline at end of file
diff --git a/src/pages/options/youtube.js b/src/pages/options/youtube/youtube.js
index c592b4cc..c1d526da 100644
--- a/src/pages/options/youtube.js
+++ b/src/pages/options/youtube/youtube.js
@@ -1,23 +1,11 @@
-import youtubeHelper from "../../assets/javascripts/helpers/youtube.js";
-import commonHelper from "../../assets/javascripts/helpers/common.js";
+import youtubeHelper from "../../../assets/javascripts/helpers/youtube/youtube.js";
+import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableYoutubeElement = document.getElementById("disable-invidious");
-let youtubeFrontendElement = document.getElementById("youtube-frontend");
-let invidiousDarkModeElement = document.getElementById("invidious-dark-mode");
-let persistInvidiousPrefsElement = document.getElementById("persist-invidious-prefs");
-let invidiousVolumeElement = document.getElementById("invidious-volume");
-let invidiousPlayerStyleElement = document.getElementById("invidious-player-style");
-let invidiousSubtitlesElement = document.getElementById("invidious-subtitles");
-let invidiousAutoplayElement = document.getElementById("invidious-autoplay");
-let useFreeTubeElement = document.getElementById("use-freetube");
-let invidiousAlwaysProxyElement = document.getElementById("always-proxy");
-let invidiousOnlyEmbeddedVideoElement = document.getElementById("only-embed");
-let invidiousVideoQualityElement = document.getElementById("video-quality");
-let invidiousVolumeValueElement = document.querySelector("#volume-value");
 
+let youtubeFrontendElement = document.getElementById("youtube-frontend");
 let invidiousDivElement = document.getElementById("invidious")
 let pipedDivElement = document.getElementById("piped")
-
 function changeFrontendsSettings(frontend) {
     if (frontend == 'piped') {
         pipedDivElement.style.display = 'block';
@@ -27,39 +15,35 @@ function changeFrontendsSettings(frontend) {
         pipedDivElement.style.display = 'none';
         invidiousDivElement.style.display = 'block';
     }
+    else if (frontend == 'freeTube') {
+        pipedDivElement.style.display = 'none';
+        invidiousDivElement.style.display = 'none';
+    }
 }
-
-youtubeHelper.init().then(() => {
-    disableYoutubeElement.checked = !youtubeHelper.getDisableYoutube();
-    invidiousDarkModeElement.checked = youtubeHelper.getInvidiousDarkMode();
-    persistInvidiousPrefsElement.checked = youtubeHelper.getPersistInvidiousPrefs();
-    invidiousVolumeElement.value = youtubeHelper.getInvidiousVolume();
-    invidiousVolumeValueElement.textContent = `${youtubeHelper.getInvidiousVolume()}%`;
-    invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle();
-    invidiousSubtitlesElement.value = youtubeHelper.getInvidiousSubtitles();
-    useFreeTubeElement.checked = youtubeHelper.getUseFreeTube();
-    invidiousOnlyEmbeddedVideoElement.checked = youtubeHelper.getInvidiousOnlyEmbeddedVideo();
-    invidiousAlwaysProxyElement.checked = youtubeHelper.getInvidiousAlwaysProxy();
-    invidiousVideoQualityElement.value = youtubeHelper.getInvidiousVideoQuality();
-    invidiousAutoplayElement.checked = youtubeHelper.getInvidiousAutoplay();
-    let frontend = youtubeHelper.getFrontend()
-    youtubeFrontendElement.value = frontend;
-    changeFrontendsSettings(frontend);
-});
-
+youtubeFrontendElement.addEventListener("change",
+    (event) => {
+        let frontend = event.target.options[youtubeFrontendElement.selectedIndex].value
+        youtubeHelper.setFrontend(frontend);
+        changeFrontendsSettings(frontend);
+    }
+);
 
 disableYoutubeElement.addEventListener("change",
     (event) => youtubeHelper.setDisableYoutube(!event.target.checked)
 );
 
+let invidiousDarkModeElement = document.getElementById("invidious-dark-mode");
 invidiousDarkModeElement.addEventListener("change",
     (event) => youtubeHelper.setInvidiousDarkMode(event.target.checked)
 );
 
+let persistInvidiousPrefsElement = document.getElementById("persist-invidious-prefs");
 persistInvidiousPrefsElement.addEventListener("change",
     (event) => youtubeHelper.setPersistInvidiousPrefs(event.target.checked)
 );
 
+let invidiousVolumeElement = document.getElementById("invidious-volume");
+let invidiousVolumeValueElement = document.querySelector("#volume-value");
 invidiousVolumeElement.addEventListener("input",
     () => {
         youtubeHelper.setInvidiousVolume(invidiousVolumeElement.value);
@@ -67,40 +51,57 @@ invidiousVolumeElement.addEventListener("input",
     }
 );
 
+let invidiousPlayerStyleElement = document.getElementById("invidious-player-style");
 invidiousPlayerStyleElement.addEventListener("change",
     (event) => youtubeHelper.setInvidiousPlayerStyle(event.target.options[invidiousPlayerStyleElement.selectedIndex].value)
 );
 
+let invidiousSubtitlesElement = document.getElementById("invidious-subtitles");
 invidiousSubtitlesElement.addEventListener("input",
     commonHelper.debounce(() => {
         youtubeHelper.setInvidiousSubtitles(invidiousSubtitlesElement.value)
     }, 500)
 );
 
+let invidiousAutoplayElement = document.getElementById("invidious-autoplay");
 invidiousAutoplayElement.addEventListener("change",
     (event) => youtubeHelper.setInvidiousAutoplay(event.target.checked)
 );
 
-useFreeTubeElement.addEventListener("change",
-    (event) => youtubeHelper.setUseFreeTube(event.target.checked)
-);
-
+let invidiousAlwaysProxyElement = document.getElementById("always-proxy");
 invidiousAlwaysProxyElement.addEventListener("change",
     (event) => youtubeHelper.setInvidiousAlwaysProxy(event.target.checked)
 );
 
+let invidiousOnlyEmbeddedVideoElement = document.getElementById("only-embed");
 invidiousOnlyEmbeddedVideoElement.addEventListener("change",
     (event) => youtubeHelper.setInvidiousOnlyEmbeddedVideo(event.target.checked)
 );
 
+let invidiousVideoQualityElement = document.getElementById("video-quality");
 invidiousVideoQualityElement.addEventListener("change",
     (event) => youtubeHelper.setInvidiousVideoQuality(event.target.options[invidiousVideoQualityElement.selectedIndex].value)
 );
 
-youtubeFrontendElement.addEventListener("change",
-    (event) => {
-        let frontend = event.target.options[youtubeFrontendElement.selectedIndex].value
-        youtubeHelper.setFrontend(frontend);
-        changeFrontendsSettings(frontend);
-    }
-);
-\ No newline at end of file
+
+youtubeHelper.init().then(() => {
+    disableYoutubeElement.checked = !youtubeHelper.getDisableYoutube();
+    invidiousDarkModeElement.checked = youtubeHelper.getInvidiousDarkMode();
+    persistInvidiousPrefsElement.checked = youtubeHelper.getPersistInvidiousPrefs();
+    invidiousVolumeElement.value = youtubeHelper.getInvidiousVolume();
+    invidiousVolumeValueElement.textContent = `${youtubeHelper.getInvidiousVolume()}%`;
+    invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle();
+    invidiousSubtitlesElement.value = youtubeHelper.getInvidiousSubtitles();
+    invidiousOnlyEmbeddedVideoElement.checked = youtubeHelper.getInvidiousOnlyEmbeddedVideo();
+    invidiousAlwaysProxyElement.checked = youtubeHelper.getInvidiousAlwaysProxy();
+    invidiousVideoQualityElement.value = youtubeHelper.getInvidiousVideoQuality();
+    invidiousAutoplayElement.checked = youtubeHelper.getInvidiousAutoplay();
+    let frontend = youtubeHelper.getFrontend()
+    youtubeFrontendElement.value = frontend;
+    changeFrontendsSettings(frontend);
+});
+
+
+
+
+
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 5362c79a..bd8a5057 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -2,7 +2,7 @@
 
 import commonHelper from "../../assets/javascripts/helpers/common.js";
 import data from "../../assets/javascripts/data.js";
-import youtubeHelper from "../../assets/javascripts/helpers/youtube.js";
+import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js";
 import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
 import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
 import mapsHelper from "../../assets/javascripts/helpers/maps.js";
author	ManeraKai <manerakai@protonmail.com>	2022-02-04 18:48:24 +0300
committer	ManeraKai <manerakai@protonmail.com>	2022-02-04 18:48:24 +0300
commit	a9f95b3d1de44edf205508233a3526246842bbf3 (patch)
tree	a273532e131ae36cee2a200c953d015c3fa36bff /src/pages
parent	Added Piped, cleaned code (diff)
download	libredirect-a9f95b3d1de44edf205508233a3526246842bbf3.zip