From 0c705e0593dd6068c4fa5c1934e6f7d7ec7b5d86 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sat, 5 Mar 2022 19:37:16 +0300 Subject: Fixed instagram targets. Changed font to Inter. Fixed a bug --- src/pages/popup/popup.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/pages/popup') diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 3d62dcd4..fe907153 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -110,12 +110,14 @@ document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage() ); -document.getElementById("change-instance").addEventListener("click", - () => browser.tabs.query({ active: true, currentWindow: true }, function (tabs) { +function changeInstance() { + browser.tabs.query({ active: true, currentWindow: true }, function (tabs) { let currTab = tabs[0]; if (currTab) { let url = currTab.url; - let tabUrl = new URL(url); + let tabUrl + try { tabUrl = new URL(url); } + catch (_) { return false; } let newUrl; newUrl = youtubeHelper.changeInstance(tabUrl); @@ -136,7 +138,14 @@ document.getElementById("change-instance").addEventListener("click", if (!newUrl) newUrl = wikipediaHelper.changeInstance(tabUrl) - if (newUrl) browser.tabs.update({ url: newUrl }); + if (newUrl) { + browser.tabs.update({ url: newUrl }); + return true; + } } }) -); + return false; +} +let changeInstanceElement = document.getElementById("change-instance") +changeInstanceElement.disabled = !changeInstance(); +changeInstanceElement.addEventListener("click", changeInstance); -- cgit 1.4.1