diff options
Diffstat (limited to 'src/pages')
| -rw-r--r-- | src/pages/options/index.js | 17 | ||||
| -rw-r--r-- | src/pages/options/widgets/services.pug | 1 | ||||
| -rw-r--r-- | src/pages/stylesheets/styles.css | 2 |
3 files changed, 15 insertions, 5 deletions
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 diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css index 875763dd..fb246b7f 100644 --- a/src/pages/stylesheets/styles.css +++ b/src/pages/stylesheets/styles.css @@ -128,7 +128,7 @@ section.links { flex-wrap: wrap; flex-direction: column; width: 300px; - max-height: 800px; + max-height: 850px; } section.links div { |