about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBobIsMyManager <bimmgitsignature.nly8m@simplelogin.co>2022-07-23 18:08:18 +0100
committerBobIsMyManager <bimmgitsignature.nly8m@simplelogin.co>2022-07-23 18:08:18 +0100
commit2e448143158a987d9ea21e231748f2bc6849d8b6 (patch)
tree6a9514a4c07ef6d0bff12e6cfcf23ee5bf625670
parentResolve protocolFallback checkbox value not being displayed correctly (diff)
downloadlibredirect-2e448143158a987d9ea21e231748f2bc6849d8b6.zip
Fixed one of the errors (1 remaining)
Diffstat (limited to '')
-rw-r--r--src/assets/javascripts/utils.js6
-rw-r--r--src/assets/javascripts/youtube/youtube.js10
-rw-r--r--src/pages/options/index.html4
-rw-r--r--src/pages/options/widgets/maps.pug2
-rw-r--r--src/pages/options/widgets/youtube.pug4
5 files changed, 16 insertions, 10 deletions
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index 7428a79f..b04024e8 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -114,13 +114,15 @@ async function processDefaultCustomInstances(target, name, protocol, document) {
 
   function calcNameCheckBoxes() {
     let isTrue = true;
-    for (const item of redirects[name][protocol])
+    for (const item of redirects[name][protocol]) {
       if (!nameDefaultRedirects.includes(item)) {
         isTrue = false;
         break;
       }
-    for (const element of nameCheckListElement.getElementsByTagName('input'))
+    }
+    for (const element of nameCheckListElement.getElementsByTagName('input')) {
       element.checked = nameDefaultRedirects.includes(element.className)
+    }
     if (nameDefaultRedirects.length == 0) isTrue = false;
     nameProtocolElement.getElementsByClassName('toggle-all')[0].checked = isTrue;
   }
diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js
index 439f5605..ffc08ed5 100644
--- a/src/assets/javascripts/youtube/youtube.js
+++ b/src/assets/javascripts/youtube/youtube.js
@@ -160,7 +160,7 @@ function all() {
     ...youtubeRedirects.piped.tor,
 
     ...youtubeRedirects.pipedMaterial.normal,
-    ...youtubeRedirects.pipedMaterial.tor,
+    //...youtubeRedirects.pipedMaterial.tor,
 
     ...invidiousNormalCustomRedirects,
     ...invidiousTorCustomRedirects,
@@ -380,9 +380,9 @@ function copyPasteInvidiousCookies(test, from) {
 
       if (protocol == 'loki') checkedInstances = [...invidiousLokiCustomRedirects];
       else if (protocol == 'i2p') checkedInstances = [...invidiousI2pCustomRedirects];
-      else if (protocol == 'tor') checkedInstances = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects]
-      if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
-        checkedInstances = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects]
+      else if (protocol == 'tor') checkedInstances = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects];
+      if ((checkedInstances.length === 0 && protocolFallback) || protocol == 'normal') {
+        checkedInstances = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects];
       }
       const i = checkedInstances.indexOf(protocolHost);
       if (i !== -1) checkedInstances.splice(i, 1);
@@ -400,7 +400,7 @@ function pasteInvidiousCookies() {
     if (protocol == 'loki') checkedInstances = [...invidiousLokiCustomRedirects];
     else if (protocol == 'i2p') checkedInstances = [...invidiousI2pCustomRedirects];
     else if (protocol == 'tor') checkedInstances = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects]
-    if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
+    if ((checkedInstances.length === 0 && protocolFallback) || protocol == 'normal') {
       checkedInstances = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects]
     }
     utils.getCookiesFromStorage('invidious', checkedInstances, 'PREFS');
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index 96b8d553..29e454bf 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -2754,13 +2754,13 @@
                         </form>
                         <div class="checklist custom-checklist"></div>
                         <div class="buttons buttons-inline">
-                          <label class="button button-inline" id="latency-facilmap-label" for="latency-facilmap"> 
+                          <label class="button button-inline" id="latency-facil-label" for="latency-facil"> 
                             <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
                               <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path>
                             </svg>&nbsp;
                             <x data-localise="__MSG_testInstancesLatency__">Test Instances Latency</x>
                           </label>
-                          <input class="button button-inline" id="latency-facilmap" style="display:none;">
+                          <input class="button button-inline" id="latency-facil" style="display:none;">
                         </div>
           </div>
           <div class="tor">
diff --git a/src/pages/options/widgets/maps.pug b/src/pages/options/widgets/maps.pug
index f220e35e..166e6494 100644
--- a/src/pages/options/widgets/maps.pug
+++ b/src/pages/options/widgets/maps.pug
@@ -18,7 +18,7 @@ section#maps_page.option-block
             include ../../widgets/instances.pug
             +instances('https://facilmap.com')
             include ../../widgets/latency.pug
-            +latency('facilmap')
+            +latency('facil')
         .tor
             +instances('http://facilmap.onion')
             include ../../widgets/instances.pug
diff --git a/src/pages/options/widgets/youtube.pug b/src/pages/options/widgets/youtube.pug
index cf175629..a7832d4c 100644
--- a/src/pages/options/widgets/youtube.pug
+++ b/src/pages/options/widgets/youtube.pug
@@ -50,7 +50,9 @@ section#youtube_page.option-block
     #piped
         hr
         .normal
+            include ../../widgets/instances.pug
             +instances('https://piped.com')
+            include ../../widgets/latency.pug
             +latency('piped')
         .tor
             +instances('http://piped.onion')
@@ -65,7 +67,9 @@ section#youtube_page.option-block
     #pipedMaterial
         hr
         .normal
+            include ../../widgets/instances.pug
             +instances('https://piped-material.com')
+            include ../../widgets/latency.pug
             +latency('pipedMaterial')
         .tor
             +instances('http://piped-material.onion')