From a43f0a7e7fa563db3b0593dc1ca588559381e1d0 Mon Sep 17 00:00:00 2001
From: BobIsMyManager <bimmgitsignature.nly8m@simplelogin.co>
Date: Sun, 24 Jul 2022 16:30:41 +0100
Subject: Squashed a few bugs

Closes https://github.com/libredirect/libredirect/issues/392
---
 src/pages/popup/popup.html |  4 +++-
 src/pages/popup/popup.js   | 14 +++++++++++---
 src/pages/popup/popup.pug  |  5 +++--
 src/pages/popup/style.css  |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/pages/popup')

diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 4030f0ec..7493ecbe 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -97,7 +97,9 @@
           <h4 data-localise="__MSG_sendFiles__">Send Files</h4></a>
         <input class="disable-sendTargets" type="checkbox"/>
       </div>
-      <hr>
+      <div id="current_site_divider">
+        <hr>
+      </div>
     </div>
     <div class="all_sites">
       <div class="youtube some-block"><a class="title" href="https://youtube.com"><img src="../../assets/images/youtube-icon.png"/>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 5e7b2336..80c560b0 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -110,6 +110,8 @@ const disableImgurAllSites = allSites.getElementsByClassName("disable-imgur")[0]
 const disableTiktokCurrentSite = currSite.getElementsByClassName("disable-tiktok")[0];
 const disableTiktokAllSites = allSites.getElementsByClassName("disable-tiktok")[0];
 
+const currentSiteIsFrontend = document.getElementById('current_site_divider')
+
 browser.storage.local.get(
   [
     "disableTwitter",
@@ -154,16 +156,19 @@ browser.storage.local.get(
 
     browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
       for (const frontend of generalHelper.allPopupFrontends) {
-        if (!r.popupFrontends.includes(frontend))
+        if (!r.popupFrontends.includes(frontend)) 
           allSites.getElementsByClassName(frontend)[0].classList.add("hide")
         else
           allSites.getElementsByClassName(frontend)[0].classList.remove("hide")
-        currSite.getElementsByClassName(frontend)[0].classList.add("hide")
+          currSite.getElementsByClassName(frontend)[0].classList.add("hide")
       }
 
       let url;
       try { url = new URL(tabs[0].url); }
-      catch { return; }
+      catch { 
+        currentSiteIsFrontend.classList.add("hide")
+        return;
+      }
 
       if (youtubeHelper.redirect(url, 'main_frame', false, true) || await youtubeHelper.switchInstance(url, 'main_frame', false, true)) {
         currSite.getElementsByClassName('youtube')[0].classList.remove("hide");
@@ -236,6 +241,9 @@ browser.storage.local.get(
       else if (youtubeMusicHelper.redirect(url, 'main_frame', false, true)) {
         currSite.getElementsByClassName('youtubeMusic')[0].classList.remove("hide");
         allSites.getElementsByClassName('youtubeMusic')[0].classList.add("hide");
+      } else {
+        currentSiteIsFrontend.classList.add("hide")
+        console.log("This page is not an instance")
       }
     })
   }
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index 13eb66a5..cd4d3713 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -119,7 +119,8 @@ html(lang="en")
     body(dir="auto")
         .current_site
             +services
-            hr
+            #current_site_divider
+                hr
         .all_sites
             +services
         hr
@@ -151,4 +152,4 @@ html(lang="en")
         .space
 
         script(type="module" src="../options/init.js")
-        script(type="module" src="./popup.js")
\ No newline at end of file
+        script(type="module" src="./popup.js")
diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css
index 8136237a..d2171dd9 100644
--- a/src/pages/popup/style.css
+++ b/src/pages/popup/style.css
@@ -20,4 +20,4 @@ html, body {
 
 .space {
     height: 10px;
-}
\ No newline at end of file
+}
-- 
cgit 1.4.1