Merge branch 'master' of https://github.com/libredirect/browser_extension

2 files changed, 15 insertions, 8 deletions

diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 0e5a3d4b..cfb7be27 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -7,15 +7,17 @@ import utils from "../../assets/javascripts/utils.js"
 document.getElementById("more-options").href = browser.runtime.getURL("pages/options/index.html")
 document.getElementById("more-options").setAttribute('target', '_blank')
 
-const os = (await browser.runtime.getPlatformInfo()).os
-
-switch (os) {
-	case "fuchsia":
-	case "ios":
-	case "android": {
-		document.getElementsByTagName("html")[0].classList.add("mobile")
+await browser.runtime.getPlatformInfo(r => {
+	switch (r.os) {
+		case "fuchsia":
+		case "ios":
+		case "android": {
+			document.getElementsByTagName("html")[0].classList.add("mobile")
+		}
 	}
 }
+)
+
 
 const allSites = document.getElementById("all_sites")
 const currSite = document.getElementById("current_site")
@@ -68,10 +70,12 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
 
 	// Set visibility of control buttons
 	if (tabs[0].url) {
+		const hr = document.getElementById("hr")
 		url = new URL(tabs[0].url)
 		servicesHelper.switchInstance(url).then(r => {
 			if (r) {
 				document.getElementById("change_instance_div").style.display = ""
+				hr.style.display = ""
 				document.getElementById("change_instance").addEventListener("click", async () =>
 					browser.tabs.update({ url: await servicesHelper.switchInstance(url) })
 				)
@@ -80,6 +84,7 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
 		servicesHelper.copyRaw(url, true).then(r => {
 			if (r) {
 				document.getElementById("copy_original_div").style.display = ""
+				hr.style.display = ""
 				document.getElementById("copy_original").addEventListener("click", () =>
 					servicesHelper.copyRaw(url)
 				)
@@ -88,6 +93,7 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
 		servicesHelper.reverse(url).then(r => {
 			if (r) {
 				document.getElementById("redirect_to_original_div").style.display = ""
+				hr.style.display = ""
 				document.getElementById("redirect_to_original").addEventListener("click", () =>
 					browser.runtime.sendMessage("reverseTab")
 				)
@@ -96,6 +102,7 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
 		servicesHelper.redirectAsync(url, "main_frame", null, true).then(r => {
 			if (r) {
 				document.getElementById("redirect_div").style.display = ""
+				hr.style.display = ""
 				document.getElementById("redirect").addEventListener("click", () =>
 					browser.runtime.sendMessage("redirectTab")
 				)
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index d7ebdd49..ed4c7319 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -30,7 +30,7 @@ html(lang="en")
                 svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" preserveAspectRatio="xMinYMin meet" fill="currentColor")
                     path(d="M 17,20 V 11 Q 17,10.175 16.412,9.587 15.825,9 15,9 H 6.8 L 8.4,7.4 7,6 3,10 7,14 8.4,12.6 6.8,11 H 15 v 9 z" id="path2")
 
-        hr
+        hr(id="hr" style="display: none")
 
         div(id="current_site")
             include /src/pages/popup/switches