From 3d883f52ab03f0fa2d0d650aa3a3789fb326c6ad Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Tue, 20 Jun 2023 11:20:32 +0300
Subject: Added Indestructables
 https://codeberg.org/LibRedirect/browser_extension/issues/91 . Fixed bugs in
 embedFrontend https://github.com/libredirect/browser_extension/issues/624

---
 src/pages/options/index.js             | 17 ++++++++++++++---
 src/pages/options/widgets/services.pug |  1 -
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/pages/options')

diff --git a/src/pages/options/index.js b/src/pages/options/index.js
index cf0fb032..2cf525ee 100644
--- a/src/pages/options/index.js
+++ b/src/pages/options/index.js
@@ -56,20 +56,31 @@ async function changeFrontendsSettings(service) {
 	}
 	if (document.getElementById(`${service}-redirectType`)) {
 		const frontend = options[service].frontend
-		if (config.services[service].frontends[frontend].embeddable || config.services[service].frontends[frontend].desktopApp) {
+		if (config.services[service].frontends[frontend].embeddable) {
 			document.getElementById(`${service}-redirectType`).innerHTML = `
 			<option value="both" data-localise="__MSG_both__">both</options>
 			<option value="sub_frame" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
 			<option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
 			`
-			document.getElementById(`${service}-redirectType`).value = options[service].redirectType
+		}
+		else if (config.services[service].frontends[frontend].desktopApp && Object.values(config.services[service].frontends).some(frontend => frontend.embeddable)) {
+			document.getElementById(`${service}-redirectType`).innerHTML = `
+			<option value="both" data-localise="__MSG_both__">both</options>
+			<option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
+			`
+			if (options[service].redirectType == "sub_frame") {
+				options[service].redirectType = "main_frame"
+				browser.storage.local.set({ options })
+			}
 		} else {
 			document.getElementById(`${service}-redirectType`).innerHTML =
 				'<option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>'
 			options[service].redirectType = "main_frame"
+
 			browser.storage.local.set({ options })
 		}
-		if (config.services[service].frontends[frontend].desktopApp) {
+		document.getElementById(`${service}-redirectType`).value = options[service].redirectType
+		if (config.services[service].frontends[frontend].desktopApp && options[service].redirectType != "main_frame") {
 			document.getElementById(`${service}-embedFrontend-div`).style.display = ''
 		} else {
 			document.getElementById(`${service}-embedFrontend-div`).style.display = 'none'
diff --git a/src/pages/options/widgets/services.pug b/src/pages/options/widgets/services.pug
index 64830cc6..d710ed7a 100644
--- a/src/pages/options/widgets/services.pug
+++ b/src/pages/options/widgets/services.pug
@@ -37,7 +37,6 @@ each val, service in services
             div(id=service+"-embedFrontend-div"  class="some-block option-block")
                 h4(data-localise="__MSG_embedFrontend__") Embed Frontend
                 select(id=service+"-embedFrontend")
-                    option(value="disabled") Disabled
                     each val, frontend in services[service].frontends
                         if services[service].frontends[frontend].embeddable && services[service].frontends[frontend].instanceList
                             option(value=frontend)=services[service].frontends[frontend].name
-- 
cgit 1.4.1