diff options
Diffstat (limited to 'src/pages/options/widgets')
| -rw-r--r-- | src/pages/options/widgets/general.js | 35 | ||||
| -rw-r--r-- | src/pages/options/widgets/services.pug | 14 |
2 files changed, 19 insertions, 30 deletions
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 2fd6a9a5..63938d78 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -58,20 +58,12 @@ importSettingsElement.addEventListener("change", () => { reader.onload = async () => { const data = JSON.parse(reader.result) if ("theme" in data && "disableImgur" in data && "imgurRedirects" in data) { - browser.storage.local.clear(() => - browser.storage.local.set({ ...data }, () => { - fetch("/instances/blacklist.json") - .then(response => response.text()) - .then(async data => { - browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => { - await generalHelper.initDefaults() - await servicesHelper.initDefaults() - await servicesHelper.upgradeOptions() - location.reload() - }) - }) - }) - ) + browser.storage.local.clear(async () => { + await generalHelper.initDefaults() + await servicesHelper.initDefaults() + await servicesHelper.upgradeOptions() + location.reload() + }) } else if ("version" in data) { let options = data delete options.version @@ -98,16 +90,10 @@ function importError() { const resetSettings = document.getElementById("reset-settings") resetSettings.addEventListener("click", async () => { resetSettings.innerHTML = "..." - browser.storage.local.clear(() => { - fetch("/instances/blacklist.json") - .then(response => response.text()) - .then(async data => { - browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => { - await generalHelper.initDefaults() - await servicesHelper.initDefaults() - location.reload() - }) - }) + browser.storage.local.clear(async () => { + await generalHelper.initDefaults() + await servicesHelper.initDefaults() + location.reload() }) }) @@ -170,7 +156,6 @@ browser.storage.local.get("options", r => { for (const x of [...exceptionsCustomInstances.url, ...exceptionsCustomInstances.regex]) { document.getElementById(`clear-${x}`).addEventListener("click", () => { - console.log(x) let index index = exceptionsCustomInstances.url.indexOf(x) if (index > -1) exceptionsCustomInstances.url.splice(index, 1) diff --git a/src/pages/options/widgets/services.pug b/src/pages/options/widgets/services.pug index ddd244d4..dc527c78 100644 --- a/src/pages/options/widgets/services.pug +++ b/src/pages/options/widgets/services.pug @@ -28,18 +28,22 @@ each val, service in services option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded + hr + each val, frontend in services[service].frontends if services[service].frontends[frontend].instanceList div(id=frontend) - each val, network in networks - div(class=network) - div(class="checklist") div(class="some-block option-block") - h4(data-localise="__MSG_customInstances__") Custom Instances + h4(data-localise="__MSG_instances__") Add your favorite instances + 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") - div(class="checklist custom-checklist") \ No newline at end of file + + div(class="checklist custom-checklist") + each val, network in networks + div(class=network) + div(class="checklist") \ No newline at end of file |