diff options
| -rw-r--r-- | src/assets/javascripts/init.js | 94 | ||||
| -rw-r--r-- | src/pages/popup/popup.js | 8 |
2 files changed, 4 insertions, 98 deletions
diff --git a/src/assets/javascripts/init.js b/src/assets/javascripts/init.js deleted file mode 100644 index 568d9cdc..00000000 --- a/src/assets/javascripts/init.js +++ /dev/null @@ -1,94 +0,0 @@ -async function initDefaults() { - return new Promise(async resolve => { - fetch("/instances/data.json") - .then(response => response.text()) - .then(async data => { - fetch("/config/config.json") - .then(response => response.text()) - .then(async config => { - browser.storage.local.get(["options", "blacklists"], async r => { - let redirects = JSON.parse(data) - let options = r.options - let targets = {} - const localstorage = {} - const latency = {} - for (const service in config.services) { - options[service] = {} - if (config.services[service].targets == "datajson") { - targets[service] = redirects[service] - } - for (const defaultOption in config.services[service].options) { - options[service][defaultOption] = config.services[service].options[defaultOption] - } - for (const frontend in config.services[service].frontends) { - if (config.services[service].frontends[frontend].instanceList) { - options[frontend] = {} - for (const network in config.networks) { - options[frontend][network] = {} - options[frontend][network].enabled = JSON.parse(data)[frontend][network] - options[frontend][network].custom = [] - } - for (const blacklist in r.blacklists) { - for (const instance of r.blacklists[blacklist]) { - let i = options[frontend].clearnet.enabled.indexOf(instance) - if (i > -1) options[frontend].clearnet.enabled.splice(i, 1) - } - } - } - } - } - browser.storage.local.set({ redirects, options, targets, latency, localstorage }) - resolve() - }) - }) - }) - }) -} - -async function upgradeOptions() { - return new Promise(async resolve => { - fetch("/config/config.json") - .then(response => response.text()) - .then(async config => { - initDefaults().then( - browser.storage.local.get(["options", "exceptions", "theme", "popupFrontends"], r => { - let options = r.options - let latency = {} - options.exceptions = r.exceptions - if (r.theme != "DEFAULT") options.theme = r.theme - for (const service in config.services) { - browser.storage.local.get([`disable${utils.camelCase(service)}`, `${service}RedirectType`, `${service}Frontend`, `${service}Latency`, `${service}EmbedFrontend`], r => { - if (r) { - options[service].enabled = r["disable" + utils.camelCase(service)] - if (r[service + "Frontend"]) options[service].frontend = r[service + "Frontend"] - if (r[service + "RedirectType"]) options[service].redirectType = r[service + "RedirectType"] - if (r[service + "EmbedFrontend"] && (service != "youtube" || r[service + "EmbedFrontend"] == ("invidious" || "piped"))) options[service].EmbedFrontend = r[service + "EmbedFrontend"] - if (r[service + "Latency"]) latency[frontend] = r[service + "Latency"] - } - }) - for (const frontend in config.services[service].frontends) { - for (const network in config.networks) { - let protocol - if (network == "clearnet") protocol == "normal" - else protocol == network - browser.storage.local.get([`${frontend}${utils.camelCase(network)}RedirectsChecks`, `${frontend}${utils.camelCase(protocol)}CustomRedirects`], r => { - if (r) { - options[frontend][network].checks = r[frontend + utils.camelCase(protocol) + "RedirectsChecks"] - options[frontend][network].custom = r[frontend + utils.camelCase(protocol) + "CustomRedirects"] - } - }) - } - } - } - browser.storage.local.set({ options, latency }) - resolve() - }) - ) - }) - }) -} - -export default { - initDefaults, - upgradeOptions, -} diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 9231f3f5..05dd70f7 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -58,7 +58,7 @@ const currentSiteIsFrontend = document.getElementById("current_site_divider") browser.storage.local.get("options", r => { browser.tabs.query({ active: true, currentWindow: true }, async tabs => { -for (const service in config.services) { + for (const service in config.services) { if (!r.options.popupServices.includes(service)) allSites.getElementsByClassName(service)[0].classList.add("hide") else allSites.getElementsByClassName(service)[0].classList.remove("hide") currSite.getElementsByClassName(service)[0].classList.add("hide") @@ -68,7 +68,7 @@ for (const service in config.services) { divs[service].toggle.all.checked = r.options[service].enabled divs[service].toggle.current.checked = r.options[service].enabled } - + let url try { url = new URL(tabs[0].url) @@ -77,13 +77,13 @@ for (const service in config.services) { document.getElementById("unify_div").style.display = "none" return } - + let service = await serviceHelper.computeService(url, true) let frontend if (service) { if (service[1]) { frontend = service[1] - service = frontend[0] + service = service[0] } divs[service].current.classList.remove("hide") divs[service].all.classList.add("hide") |