Added alwaysUsePreferred to Twitter and Reddit

6 files changed, 26 insertions, 22 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 3211e1c7..c35e240c 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -11,7 +11,7 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
 import mediumHelper from "../../assets/javascripts/helpers/medium.js";
 import imgurHelper from "../../assets/javascripts/helpers/imgur.js";
 import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js";
-import exceptionsHelper from "../../assets/javascripts/helpers/exceptions.js";
+import generalHelper from "../../assets/javascripts/helpers/general.js";
 import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js";
 
 window.browser = window.browser || window.chrome;
@@ -29,7 +29,7 @@ async function wholeInit() {
   wikipediaHelper.init()
   imgurHelper.init()
   tiktokHelper.init()
-  exceptionsHelper.init()
+  generalHelper.init()
 
 }
 wholeInit();
@@ -73,7 +73,7 @@ browser.webRequest.onBeforeRequest.addListener(
 
     if (wikipediaHelper.isWikipedia(url, initiator)) newUrl = wikipediaHelper.redirect(url);
 
-    if (exceptionsHelper.isException(url, initiator)) newUrl = null;
+    if (generalHelper.isException(url, initiator)) newUrl = null;
 
     if (BYPASSTABs.includes(details.tabId)) newUrl = null;
 
diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html
index 8b9e401d..ddfa931d 100644
--- a/src/pages/options/general/general.html
+++ b/src/pages/options/general/general.html
@@ -96,6 +96,10 @@
       </select>
     </div>
 
+    <div class="some-block option-block">
+      <h4>Always use Preferred Instances</h4>
+      <input id="always-use-preferred" type="checkbox" checked />
+    </div>
 
     <div class="some-block option-block">
       <h4>Exceptions</h4>
diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js
index 5d4c0307..344af4aa 100644
--- a/src/pages/options/general/general.js
+++ b/src/pages/options/general/general.js
@@ -2,7 +2,7 @@
 window.browser = window.browser || window.chrome;
 
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
-import exceptionsHelper from "../../../assets/javascripts/helpers/exceptions.js";
+import generalHelper from "../../../assets/javascripts/helpers/general.js";
 
 let themeElement = document.getElementById("theme");
 
@@ -44,32 +44,42 @@ function exportSettings() {
 }
 exportSettings();
 
+browser.storage.onChanged.addListener(exportSettings);
+
 let importSettingsElement = document.getElementById("import-settings");
 importSettingsElement.addEventListener("change",
-  _ => {
+  () => {
     let file = importSettingsElement.files[0];
     const reader = new FileReader();
     reader.readAsText(file);
     reader.onload = () => browser.storage.local.set({ ...JSON.parse(reader.result) })
     reader.onerror = error => reject(error);
-    exportSettings();
+    location.reload();
   }
 );
 
 let resetSettingsElement = document.getElementById("reset-settings");
+
 resetSettingsElement.addEventListener("click",
   () => {
     console.log("reset");
     browser.storage.local.clear();
-    exportSettings();
+    location.reload();
   }
 );
 
+let alwaysUsePreferredElement = document.getElementById("always-use-preferred")
+alwaysUsePreferredElement.addEventListener("change",
+  event => generalHelper.setAlwaysUsePreferred(event.target.checked)
+);
+
 let nameCustomInstanceInput = document.getElementById("exceptions-custom-instance");
 let instanceTypeElement = document.getElementById("exceptions-custom-instance-type");
 let instanceType = "url"
 
-exceptionsHelper.init().then(() => {
+generalHelper.init().then(() => {
+  alwaysUsePreferredElement.checked = generalHelper.getAlwaysUsePreferred();
+  console.log("generalHelper.getAlwaysUsePreferred()");
   instanceTypeElement.addEventListener("change",
     (event) => {
       instanceType = event.target.options[instanceTypeElement.selectedIndex].value
@@ -83,7 +93,7 @@ exceptionsHelper.init().then(() => {
       }
     }
   )
-  let exceptionsCustomInstances = exceptionsHelper.getExceptions();
+  let exceptionsCustomInstances = generalHelper.getExceptions();
   function calcExceptionsCustomInstances() {
     console.log("exceptionsCustomInstances", exceptionsCustomInstances)
     document.getElementById("exceptions-custom-checklist").innerHTML =
@@ -112,7 +122,7 @@ exceptionsHelper.init().then(() => {
             if (index > -1)
               exceptionsCustomInstances.regex.splice(index, 1);
           }
-          exceptionsHelper.setExceptions(exceptionsCustomInstances);
+          generalHelper.setExceptions(exceptionsCustomInstances);
           calcExceptionsCustomInstances();
         });
     }
@@ -133,7 +143,7 @@ exceptionsHelper.init().then(() => {
       if (val.trim() != '' && !exceptionsCustomInstances.regex.includes(val)) exceptionsCustomInstances.regex.push(val)
     }
     if (val) {
-      exceptionsHelper.setExceptions(exceptionsCustomInstances);
+      generalHelper.setExceptions(exceptionsCustomInstances);
       console.log("exceptionsCustomInstances", exceptionsCustomInstances)
       nameCustomInstanceInput.value = '';
     }
diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js
index 8e435675..5feddec6 100644
--- a/src/pages/options/reddit/reddit.js
+++ b/src/pages/options/reddit/reddit.js
@@ -78,6 +78,7 @@ redditHelper.init().then(() => {
     protocolElement.value = protocol;
     changeProtocolSettings(protocol);
 
+
     commonHelper.processDefaultCustomInstances(
         'libreddit',
         'normal',
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index 5608975d..e0774c0a 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -137,11 +137,6 @@
       </div>
 
       <div class="some-block option-block">
-        <h4>Always use Preferred Instances</h4>
-        <input id="always-use-preferred" type="checkbox" checked />
-      </div>
-
-      <div class="some-block option-block">
         <h4>Bypass Watch On YouTube</h4>
         <input id="bypass-watch-on-youtube" type="checkbox" checked />
       </div>
diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js
index cc87edbe..168a9d30 100644
--- a/src/pages/options/youtube/youtube.js
+++ b/src/pages/options/youtube/youtube.js
@@ -100,11 +100,6 @@ OnlyEmbeddedVideoElement.addEventListener("change",
     event => youtubeHelper.setOnlyEmbeddedVideo(event.target.options[OnlyEmbeddedVideoElement.selectedIndex].value)
 );
 
-let alwaysUsePreferredElement = document.getElementById("always-use-preferred")
-alwaysUsePreferredElement.addEventListener("change",
-    event => youtubeHelper.setAlwaysusePreferred(event.target.checked)
-);
-
 let bypassWatchOnYoutubeElement = document.getElementById("bypass-watch-on-youtube")
 bypassWatchOnYoutubeElement.addEventListener("change",
     event => youtubeHelper.setBypassWatchOnYoutube(event.target.checked)
@@ -145,7 +140,6 @@ youtubeHelper.init().then(() => {
     volumeElement.value = youtubeHelper.getVolume();
     volumeValueElement.textContent = `${youtubeHelper.getVolume()}%`;
     OnlyEmbeddedVideoElement.value = youtubeHelper.getOnlyEmbeddedVideo();
-    alwaysUsePreferredElement.checked = youtubeHelper.getAlwaysusePreferred();
     bypassWatchOnYoutubeElement.checked = youtubeHelper.getBypassWatchOnYoutube();
     autoplayElement.value = youtubeHelper.getAutoplay();
     let frontend = youtubeHelper.getFrontend();