@@ -75,243 +75,6 @@

From

- -

To

- -

Engine

- -

Default Instances

@@ -362,7 +125,7 @@

Default Instances

diff --git a/src/pages/options/translate/translate.js b/src/pages/options/translate/translate.js index 3338f8ce..55a2d74f 100644 --- a/src/pages/options/translate/translate.js +++ b/src/pages/options/translate/translate.js @@ -1,51 +1,38 @@ import translateHelper from "../../../assets/javascripts/helpers/translate/translate.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; -let disableElement = document.getElementById("disable-simplyTranslate"); -let simplyTranslateDivElement = document.getElementById("simplyTranslate"); -let lingvaDivElement = document.getElementById("lingva"); -let translateFrontendElement = document.getElementById("translate-frontend"); -let protocolElement = document.getElementById("protocol"); +let disable = document.getElementById("disable-simplyTranslate"); +let simplyTranslateDiv = document.getElementById("simplyTranslate"); +let lingvaDiv = document.getElementById("lingva"); +let frontend = document.getElementById("translate-frontend"); +let protocol = document.getElementById("protocol"); -function changeFrontendsSettings(frontend) { - if (frontend == 'simplyTranslate') { - simplyTranslateDivElement.style.display = 'block'; - lingvaDivElement.style.display = 'none'; + +function changeFrontendsSettings() { + if (frontend.value == 'simplyTranslate') { + simplyTranslateDiv.style.display = 'block'; + lingvaDiv.style.display = 'none'; } - else if (frontend == 'lingva') { - simplyTranslateDivElement.style.display = 'none'; - lingvaDivElement.style.display = 'block'; + else if (frontend.value == 'lingva') { + simplyTranslateDiv.style.display = 'none'; + lingvaDiv.style.display = 'block'; } } -document.addEventListener("change", async () => { - await browser.storage.local.set({ - translateDisable: !disableElement.checked, - translateFrontend: translateFrontendElement.value, - translateProtocol: protocolElement.value, - translateFrom: fromElement.value, - translateTo: toElement.value, - simplyTranslateEngine: simplyTranslateEngineElement.value, - }) - changeProtocolSettings(protocolElement.value); - changeFrontendsSettings(translateFrontendElement.value); -}) - - -function changeProtocolSettings(protocol) { +function changeProtocolSettings() { let normalSimplyTranslateDiv = document.getElementById("simplyTranslate").getElementsByClassName("normal")[0]; let torSimplyTranslateDiv = document.getElementById("simplyTranslate").getElementsByClassName("tor")[0]; let normalLingvaDiv = document.getElementById("lingva").getElementsByClassName("normal")[0]; let torLingvaDiv = document.getElementById("lingva").getElementsByClassName("tor")[0]; - if (protocol == 'normal') { + if (protocol.value == 'normal') { normalSimplyTranslateDiv.style.display = 'block'; normalLingvaDiv.style.display = 'block'; torLingvaDiv.style.display = 'none'; torSimplyTranslateDiv.style.display = 'none'; } - else if (protocol == 'tor') { + else if (protocol.value == 'tor') { normalSimplyTranslateDiv.style.display = 'none'; normalLingvaDiv.style.display = 'none'; torLingvaDiv.style.display = 'block'; @@ -53,35 +40,32 @@ function changeProtocolSettings(protocol) { } } -let fromElement = document.getElementsByClassName("from")[0]; -let toElement = document.getElementsByClassName("to")[0]; -let simplyTranslateElement = document.getElementById("simplyTranslate") -let simplyTranslateEngineElement = simplyTranslateElement.getElementsByClassName("engine")[0]; - browser.storage.local.get( [ "translateDisable", "translateFrontend", "translateProtocol", - "translateFrom", - "translateTo", - "simplyTranslateEngine", ], r => { - disableElement.checked = !r.translateDisable; - - translateFrontendElement.value = r.translateFrontend; - changeFrontendsSettings(r.translateFrontend); - - protocolElement.value = r.translateProtocol; - changeProtocolSettings(r.translateProtocol); - - fromElement.value = r.translateFrom; - toElement.value = r.translateTo; - simplyTranslateEngineElement.value = r.simplyTranslateEngine; + disable.checked = !r.translateDisable; + frontend.value = r.translateFrontend; + protocol.value = r.translateProtocol; + changeFrontendsSettings(); + changeProtocolSettings(); } ); +document.addEventListener("change", () => { + browser.storage.local.set({ + translateDisable: !disable.checked, + translateFrontend: frontend.value, + translateProtocol: protocol.value, + }) + changeProtocolSettings(); + changeFrontendsSettings(); +}) + + commonHelper.processDefaultCustomInstances('translate', 'simplyTranslate', 'normal', document) commonHelper.processDefaultCustomInstances('translate', 'simplyTranslate', 'tor', document); commonHelper.processDefaultCustomInstances('translate', 'lingva', 'normal', document); diff --git a/src/pages/options/translate/translate.pug b/src/pages/options/translate/translate.pug index f6a192c4..42afcdf1 100644 --- a/src/pages/options/translate/translate.pug +++ b/src/pages/options/translate/translate.pug @@ -25,28 +25,7 @@ body.option(dir="auto") option(value="tor" data-localise="__MSG_tor__") Tor hr - #simplyTranslate - .some-block.option-block - h4(data-localise="__MSG_from__") From - select.from - option(value="auto") Auto - include ../../widgets/from-to.pug - - .some-block.option-block - h4(data-localise="__MSG_to__") To - select.to - include ../../widgets/from-to.pug - - .some-block.option-block - h4(data-localise="__MSG_engine__") Engine - select.engine - option(value="google") Google - option(value="libre") Libre - option(value="deepl") Deepl - option(value="iciba") ICIBA - option(value="reverso") Reverso - .normal include ../../widgets/instances.pug +instances('https://simplytranslate.org') @@ -55,9 +34,7 @@ body.option(dir="auto") .tor include ../../widgets/instances.pug +instances('http://hxecvvetgrznmprg.onion') - - #lingva - + #lingva .normal include ../../widgets/instances.pug +instances('https://lingvatranslate.com') -- cgit 1.4.1