diff options
| -rw-r--r-- | src/assets/javascripts/general.js | 2 | ||||
| -rw-r--r-- | src/assets/javascripts/get-localstorage.js | 15 | ||||
| -rw-r--r-- | src/assets/javascripts/services.js | 18 | ||||
| -rw-r--r-- | src/assets/javascripts/set-localstorage.js | 13 | ||||
| -rw-r--r-- | src/pages/options/widgets/services.ejs | 29 | ||||
| -rw-r--r-- | src/pages/options/widgets/services.js | 19 |
6 files changed, 26 insertions, 70 deletions
diff --git a/src/assets/javascripts/general.js b/src/assets/javascripts/general.js index 7b8f9dac..7fc9d1ba 100644 --- a/src/assets/javascripts/general.js +++ b/src/assets/javascripts/general.js @@ -32,8 +32,6 @@ async function initDefaults() { }, theme: "detect", popupServices: ["youtube", "twitter", "instagram", "tiktok", "imgur", "reddit", "quora", "translate", "maps"], - network: "clearnet", - networkFallback: true, }, }, () => resolve() diff --git a/src/assets/javascripts/get-localstorage.js b/src/assets/javascripts/get-localstorage.js deleted file mode 100644 index 66740408..00000000 --- a/src/assets/javascripts/get-localstorage.js +++ /dev/null @@ -1,15 +0,0 @@ -window.browser = window.browser || window.chrome - -browser.storage.local.get(["localstorage", "tmp"], r => { - let localstorageJson = r.localstorage - const frontend = r.tmp[0] - const items = r.tmp[1] - localstorageJson[frontend] = {} - - for (const item of items) { - let tmp = localStorage.getItem(item) - if (tmp) localstorageJson[frontend][item] = tmp - } - - browser.storage.local.set({ localstorage: localstorageJson }) -}) diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index d763bf6a..3b58f711 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -89,8 +89,10 @@ function redirect(url, type, initiator, forceRedirection) { if (initiator && all(service, null, options, config, redirects).includes(initiator.origin)) return "BYPASSTAB" if (config.services[service].frontends[frontend].instanceList) { - let instanceList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] - if (instanceList.length === 0 && options.networkFallback) instanceList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] + let instanceList = [] + for (const network in options[frontend]) { + instanceList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom]) + } if (instanceList.length === 0) return randomInstance = utils.getRandomInstance(instanceList) } else if (config.services[service].frontends[frontend].singleInstance) randomInstance = config.services[service].frontends[frontend].singleInstance @@ -489,15 +491,17 @@ function switchInstance(url) { for (const service in config.services) { if (!all(service, null, options, config, redirects).includes(protocolHost)) continue - let instancesList + let instancesList = [] if (Object.keys(config.services[service].frontends).length == 1) { const frontend = Object.keys(config.services[service].frontends)[0] - instancesList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] - if (instancesList.length === 0 && options.networkFallback) instancesList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] + for (const network in options[frontend]) { + instancesList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom]) + } } else { const frontend = options[service].frontend - instancesList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] - if (instancesList.length === 0 && options.networkFallback) instancesList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] + for (const network in options[frontend]) { + instancesList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom]) + } } let oldInstance diff --git a/src/assets/javascripts/set-localstorage.js b/src/assets/javascripts/set-localstorage.js deleted file mode 100644 index 8dbfcad7..00000000 --- a/src/assets/javascripts/set-localstorage.js +++ /dev/null @@ -1,13 +0,0 @@ -window.browser = window.browser || window.chrome - -browser.storage.local.get(["localstorage", "tmp"], r => { - const localstorageJson = r.localstorage - const frontend = r.tmp[0] - const items = localstorageJson[frontend] - - for (const item in items) { - localStorage.setItem(item, items[item]) - } - - window.close() -}) diff --git a/src/pages/options/widgets/services.ejs b/src/pages/options/widgets/services.ejs index ea93b1ce..20b4e8fa 100644 --- a/src/pages/options/widgets/services.ejs +++ b/src/pages/options/widgets/services.ejs @@ -46,28 +46,29 @@ <% for (const network in config.networks) { -%> <div class="<%= network %>"> <div class="some-block option-block"> - <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4> + <h4><%= network.charAt(0).toUpperCase() + network.slice(1) %></h4> </div> <div class="checklist"></div> <hr /> - <div class="some-block option-block"> - <h4 data-localise="__MSG_customInstances__">Custom Instances</h4> - </div> - <form class="custom-instance-form"> - <div class="some-block option-block"> - <input class="custom-instance" placeholder="http://<%= frontend %>.<%= config.networks[network].tld %>" type="url" /> - <button class="add add-instance" type="submit"> - <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> - <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path> - </svg> - </button> - </div> - </form> + <div class="checklist custom-checklist"></div> <% if (network=="clearnet" ) { _%> <% } _%> </div> <% } %> + <div class="some-block option-block"> + <h4 data-localise="__MSG_customInstances__">Custom Instances</h4> + </div> + <form class="custom-instance-form"> + <div class="some-block option-block"> + <input class="custom-instance" placeholder="http://<%= frontend %>.com" type="url" /> + <button class="add add-instance" type="submit"> + <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path> + </svg> + </button> + </div> + </form> </div> <% } _%> <% } %> </section> diff --git a/src/pages/options/widgets/services.js b/src/pages/options/widgets/services.js index 351d45e5..e9577260 100644 --- a/src/pages/options/widgets/services.js +++ b/src/pages/options/widgets/services.js @@ -60,25 +60,6 @@ function changeFrontendsSettings(service) { } } -function changeNetworkSettings() { - for (const service in config.services) { - for (const frontend in config.services[service].frontends) { - if (config.services[service].frontends[frontend].instanceList) { - const frontendDiv = document.getElementById(frontend) - for (const network in config.networks) { - const networkDiv = frontendDiv.getElementsByClassName(network)[0] - if (network == options.network) { - networkDiv.style.display = "block" - } else { - networkDiv.style.display = "none" - } - } - } - } - } -} - -changeNetworkSettings() for (const service in config.services) { divs[service] = {} //divs[service].page = document.getElementById(`${service}_page`) |