Link menu: Redirect, Reverse, Copy Reverse. Icon menu: Settings, SwitchInstance, Copy Reverse, Redirect, Reverse redirect. https://github.com/libredirect/libredirect/issues/607

1 files changed, 21 insertions, 15 deletions

diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 560aea9d..705aaa8b 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -4,23 +4,29 @@ window.browser = window.browser || window.chrome
 import servicesHelper from "../../assets/javascripts/services.js"
 import utils from "../../assets/javascripts/utils.js"
 
-servicesHelper.switchInstance().then(r => {
-	if (!r)
-		document.getElementById("change_instance_div").style.display = "none"
-	else
-		document.getElementById("change_instance").addEventListener("click", async () => {
-			browser.tabs.update({ url: await servicesHelper.switchInstance() })
-		})
+browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
+	const url = new URL(tabs[0].url)
+	servicesHelper.switchInstance(url).then(r => {
+		if (!r) {
+			document.getElementById("change_instance_div").style.display = "none"
+		}
+		else {
+			document.getElementById("change_instance").addEventListener("click",
+				async () => browser.tabs.update({ url: await servicesHelper.switchInstance(url) })
+			)
+		}
+	})
+	servicesHelper.copyRaw(url, true).then(r => {
+		if (!r) {
+			document.getElementById("copy_raw_div").style.display = "none"
+		}
+		else {
+			const copy_raw = document.getElementById("copy_raw")
+			copy_raw.addEventListener("click", () => servicesHelper.copyRaw(url))
+		}
+	})
 })
 
-servicesHelper.copyRaw(true).then(r => {
-	if (!r)
-		document.getElementById("copy_raw_div").style.display = "none"
-	else {
-		const copy_raw = document.getElementById("copy_raw")
-		copy_raw.addEventListener("click", () => servicesHelper.copyRaw(false, copy_raw))
-	}
-})
 document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage())
 
 const allSites = document.getElementsByClassName("all_sites")[0]