Fixed bugs

4 files changed, 31 insertions, 26 deletions

diff --git a/src/pages/options/youtube/invidious.js b/src/pages/options/youtube/invidious.js
index b99a3ab3..9df34067 100644
--- a/src/pages/options/youtube/invidious.js
+++ b/src/pages/options/youtube/invidious.js
@@ -115,25 +115,31 @@ invidiousSavePlayerPosElement.addEventListener("change",
 );
 
 youtubeHelper.init().then(() => {
+    invidiousVideoLoopElement.checked = youtubeHelper.getInvidiousVideoLoop();
+
     invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle();
-    invidiousAlwaysProxyElement.value = youtubeHelper.getInvidiousAlwaysProxy();
-    invidiousVideoLoopElement.value = youtubeHelper.getInvidiousVideoLoop();
-    invidiousContinueAutoplayElement.value = youtubeHelper.getInvidiousContinueAutoplay();
-    invidiousContinueElement.value = youtubeHelper.getInvidiousContinue();
-    youtubeListenElement.value = youtubeHelper.getYoutubeListen();
+
+    invidiousContinueAutoplayElement.checked = youtubeHelper.getInvidiousContinueAutoplay();
+    invidiousContinueElement.checked = youtubeHelper.getInvidiousContinue();
+    invidiousAlwaysProxyElement.checked = youtubeHelper.getInvidiousAlwaysProxy();
+    youtubeListenElement.checked = youtubeHelper.getYoutubeListen();
+
     invidiousSpeedElement.value = youtubeHelper.getInvidiousSpeed();
     invidiousQualityElement.value = youtubeHelper.getInvidiousQuality();
     invidiousQualityDashElement.value = youtubeHelper.getInvidiousQualityDash();
+
     invidiousComments0Element.value = youtubeHelper.getInvidiousComments()[0];
     invidiousComments1Element.value = youtubeHelper.getInvidiousComments()[1];
+
     invidiousCaptions0Element.value = youtubeHelper.getInvidiousCaptions()[0];
     invidiousCaptions1Element.value = youtubeHelper.getInvidiousCaptions()[1];
     invidiousCaptions2Element.value = youtubeHelper.getInvidiousCaptions()[2];
-    invidiousRelatedVideoElement.value = youtubeHelper.getInvidiousRelatedVideos();
-    invidiousAnnotationsElement.value = youtubeHelper.getInvidiousAnnotations();
-    invidiousExtendDescElement.value = youtubeHelper.getInvidiousExtendDesc();
-    invidiousVrModeElement.value = youtubeHelper.getInvidiousVrMode();
-    invidiousSavePlayerPosElement.value = youtubeHelper.getInvidiousSavePlayerPos();
+
+    invidiousRelatedVideoElement.checked = youtubeHelper.getInvidiousRelatedVideos();
+    invidiousAnnotationsElement.checked = youtubeHelper.getInvidiousAnnotations();
+    invidiousExtendDescElement.checked = youtubeHelper.getInvidiousExtendDesc();
+    invidiousVrModeElement.checked = youtubeHelper.getInvidiousVrMode();
+    invidiousSavePlayerPosElement.checked = youtubeHelper.getInvidiousSavePlayerPos();
 
     commonHelper.processDefaultCustomInstances(
         'invidious',
diff --git a/src/pages/options/youtube/piped.js b/src/pages/options/youtube/piped.js
index 015c97d8..876106e2 100644
--- a/src/pages/options/youtube/piped.js
+++ b/src/pages/options/youtube/piped.js
@@ -17,9 +17,9 @@ function selectSkipModify(value, boolean) {
     youtubeHelper.setPipedSelectedSkip(selectSkip)
 }
 
-let pipedSelectedSkipSponsorElement = document.getElementById("piped-selectedSkip-sponsors");
+let pipedSelectedSkipSponsorElement = document.getElementById("piped-selectedSkip-sponsor");
 pipedSelectedSkipSponsorElement.addEventListener("change",
-    event => selectSkipModify('sponsors', event.target.checked)
+    event => selectSkipModify('sponsor', event.target.checked)
 );
 
 let pipedSelectedSkipIntroElement = document.getElementById("piped-selectedSkip-intro");
@@ -148,9 +148,9 @@ pipedMaterialSkipToLastPointElement.addEventListener("change",
 );
 
 
-let pipedMaterialSelectedSkipSponsorElement = document.getElementById("pipedMaterial-selectedSkip-sponsors");
+let pipedMaterialSelectedSkipSponsorElement = document.getElementById("pipedMaterial-selectedSkip-sponsor");
 pipedMaterialSelectedSkipSponsorElement.addEventListener("change",
-    event => selectSkipModify('sponsors', event.target.checked)
+    event => selectSkipModify('sponsor', event.target.checked)
 );
 
 let pipedMaterialSelectedSkipIntroElement = document.getElementById("pipedMaterial-selectedSkip-intro");
@@ -198,7 +198,9 @@ youtubeHelper.init().then(() => {
 
     pipedSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock();
     selectSkip = youtubeHelper.getPipedSelectedSkip();
-    pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsors');
+    console.log("selectSkip", selectSkip)
+    pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsor');
+    console.log("selectSkip.includes('sponsor')", selectSkip.includes('sponsor'))
     pipedSelectedSkipIntroElement.checked = selectSkip.includes('intro');
     pipedSelectedSkipOutroElement.checked = selectSkip.includes('outro');
     pipedSelectedSkipPreviewElement.checked = selectSkip.includes('preview');
@@ -224,7 +226,7 @@ youtubeHelper.init().then(() => {
     pipedMaterialProxyLBRYElement.checked = youtubeHelper.getPipedProxyLBRY();
     pipedMaterialSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock()
     pipedMaterialSkipToLastPointElement.checked = youtubeHelper.getPipedMaterialSkipToLastPoint();
-    pipedMaterialSelectedSkipSponsorElement.checked = selectSkip.includes('sponsors');
+    pipedMaterialSelectedSkipSponsorElement.checked = selectSkip.includes('sponsor');
     pipedMaterialSelectedSkipIntroElement.checked = selectSkip.includes('intro');
     pipedMaterialSelectedSkipOutroElement.checked = selectSkip.includes('outro');
     pipedMaterialSelectedSkipPreviewElement.checked = selectSkip.includes('preview');
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index af7e8d3d..d36e8ba1 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -207,13 +207,13 @@
         </div>
 
         <div class="some-block option-block">
-          <h4>Autoplay next video</h4>
-          <input id="invidious-continue_autoplay" type="checkbox" />
+          <h4>Play next by default</h4>
+          <input id="invidious-continue" type="checkbox" />
         </div>
 
         <div class="some-block option-block">
-          <h4>Play next by default</h4>
-          <input id="invidious-continue" type="checkbox" />
+          <h4>Autoplay next video</h4>
+          <input id="invidious-continue_autoplay" type="checkbox" />
         </div>
 
         <div class="some-block option-block">
@@ -779,7 +779,7 @@
 
         <div class="some-block option-block">
           <h4>Skip Sponsors</h4>
-          <input id="piped-selectedSkip-sponsors" type="checkbox" />
+          <input id="piped-selectedSkip-sponsor" type="checkbox" />
         </div>
 
         <div class="some-block option-block">
@@ -845,7 +845,7 @@
 
         <div class="some-block option-block">
           <h4>Buffering Goal (in seconds)</h4>
-          <input id="piped-bufferGoal" type="number" min="0" />
+          <input id="piped-bufferGoal" type="number" min="10" />
         </div>
 
         <div class="some-block option-block">
@@ -1174,7 +1174,7 @@
 
         <div class="some-block option-block">
           <h4>Skip Sponsors</h4>
-          <input id="pipedMaterial-selectedSkip-sponsors" type="checkbox" />
+          <input id="pipedMaterial-selectedSkip-sponsor" type="checkbox" />
         </div>
 
         <div class="some-block option-block">
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 75f3a3dd..4d7d302d 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -78,7 +78,6 @@ wholeInit().then(() => {
   disableLbryElement.checked = !lbryHelper.getDisable();
 
   let changeInstanceElement = document.getElementById("change-instance")
-  changeInstanceElement.disabled = !changeInstance();
   changeInstanceElement.addEventListener("click", changeInstance);
 })
 
@@ -198,8 +197,6 @@ function changeInstance() {
   return false;
 }
 
-
-
 let popupFrontends;
 generalHelper.init().then(() => {
   popupFrontends = generalHelper.getPopupFrontends();