multi-tabs: show error only if the stored url is open

papameet · Oct 6, 2020 · b6858a8 · b6858a8
1 parent ff97737
commit b6858a8
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/main.js b/src/main.js
@@ -207,12 +207,19 @@ getPageURL().then((url) => {
   } else {
     browser.storage.local.get("url").then((storedURL) => {
       storedURL = storedURL.url;
-      if (storedURL && storedURL !== url) {
-        const content = document.getElementById("buttons-div");
-        content.removeAttribute("buttons-div");
-        content.setAttribute("id", "single-instance-err");
-        content.innerHTML = `Supports only one tab now. Open the extension in <p id="stored-url">${storedURL}</p> and click "Reset" to use here`;
-      }
+      browser.tabs.query({}).then((tabs) => {
+        const urls = tabs.map((tab) => tab.url);
+        if (storedURL && storedURL !== url) {
+          if (!urls.includes(storedURL)) {
+            removeCurrentURLfromStorage();
+            return;
+          }
+          const content = document.getElementById("buttons-div");
+          content.removeAttribute("buttons-div");
+          content.setAttribute("id", "single-instance-err");
+          content.innerHTML = `Supports only one tab now. Open the extension in <p id="stored-url">${storedURL}</p> and click "Reset" to use here`;
+        }
+      });
     });
   }
 });