diff options
Diffstat (limited to 'src/pages')
| -rw-r--r-- | src/pages/background/background.js | 4 | ||||
| -rw-r--r-- | src/pages/options/index.js | 18 | ||||
| -rw-r--r-- | src/pages/options/widgets/services.pug | 9 |
3 files changed, 13 insertions, 18 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 8e427763..cb925607 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -53,8 +53,8 @@ browser.webRequest.onBeforeRequest.addListener( } if (!newUrl) { - const match = url.href.match(/^https?:\/{2}(.*)\.libredirect\.invalid.*/) - if (match[1]) { + const match = url.href.match(/^https?:\/{2}.*\.libredirect\.invalid.*/) + if (match) { browser.tabs.update({ url: browser.runtime.getURL(`/pages/messages/no_instance.html`) }); diff --git a/src/pages/options/index.js b/src/pages/options/index.js index 5b229656..c8eb500d 100644 --- a/src/pages/options/index.js +++ b/src/pages/options/index.js @@ -35,8 +35,10 @@ async function changeFrontendsSettings(service) { if (typeof divs[service].frontend !== "undefined") { if (frontend == divs[service].frontend.value) { frontendDiv.style.display = "" - if (config.services[service].frontends[frontend].localhost == true) { + console.log(config.services[service].frontends[frontend].localhost) + if (config.services[service].frontends[frontend].localhost === true) { document.getElementById(`${service}-instance-div`).style.display = "" + if (options[service].instance == "localhost") { frontendDiv.style.display = "none" } @@ -50,7 +52,8 @@ async function changeFrontendsSettings(service) { } } if (document.getElementById(`${service}-redirectType`)) { - const frontend = options[service].frontend ?? Object.keys(config.services[service].frontends)[0] + const frontend = options[service].frontend + console.log(frontend) if (config.services[service].frontends[frontend].embeddable) { document.getElementById(`${service}-redirectType`).innerHTML = ` <option value="both" data-localise="__MSG_both__">both</options> @@ -59,19 +62,14 @@ async function changeFrontendsSettings(service) { ` document.getElementById(`${service}-redirectType`).value = options[frontend].redirectType = options[service].redirectType } else { - document.getElementById(`${service}-redirectType`).innerHTML = ` - <option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option> - ` + 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 }) } } const frontend_name_element = document.getElementById(`${service}_page`).getElementsByClassName("frontend_name")[0] - if (divs[service].frontend) { - frontend_name_element.href = config.services[service].frontends[divs[service].frontend.value].url - } else { - frontend_name_element.href = Object.values(config.services[service].frontends)[0].url - } + frontend_name_element.href = config.services[service].frontends[divs[service].frontend.value].url } async function loadPage(path) { diff --git a/src/pages/options/widgets/services.pug b/src/pages/options/widgets/services.pug index 6530bacf..7154050e 100644 --- a/src/pages/options/widgets/services.pug +++ b/src/pages/options/widgets/services.pug @@ -20,11 +20,8 @@ each val, service in services h4 a(class="frontend_name" target="_blank" data-localise="__MSG_frontend__") Frontend select(id=service+"-frontend") - if Object.keys(services[service].frontends).length> 1 - each val, frontend in services[service].frontends - option(value=frontend)=services[service].frontends[frontend].name - else - option(value=frontend)=Object.values(services[service].frontends)[0].name + each val, frontend in services[service].frontends + option(value=frontend)=services[service].frontends[frontend].name div(class="some-block option-block" id=service+"-instance-div") h4() Instance @@ -47,11 +44,11 @@ each val, service in services div(class="some-block option-block") h4 Set LibRedirect as Default Search Engine - hr each val, frontend in services[service].frontends if services[service].frontends[frontend].instanceList div(id=frontend dir="ltr") + hr div(dir="auto" class="some-block option-block") h4(data-localise="__MSG_addYourFavoriteInstances__") Add your favorite instances |