diff options
| author | ManeraKai <manerakai@protonmail.com> | 2023-03-05 17:29:09 +0300 |
|---|---|---|
| committer | ManeraKai <manerakai@protonmail.com> | 2023-03-05 17:29:09 +0300 |
| commit | 53cfc0522795c6487c5f4e7a6cdac4f426151ef8 (patch) | |
| tree | 7e98d8f05a358b5ba799465a02534c0d12f04a30 /src/assets | |
| parent | Merge branch 'master' of https://github.com/libredirect/libredirect (diff) | |
| download | libredirect-53cfc0522795c6487c5f4e7a6cdac4f426151ef8.zip | |
Fixed random bugs
Diffstat (limited to 'src/assets')
| -rw-r--r-- | src/assets/javascripts/general.js | 6 | ||||
| -rw-r--r-- | src/assets/javascripts/services.js | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/assets/javascripts/general.js b/src/assets/javascripts/general.js index 592f604d..7adb0433 100644 --- a/src/assets/javascripts/general.js +++ b/src/assets/javascripts/general.js @@ -7,8 +7,10 @@ window.browser = window.browser || window.chrome let exceptions function isException(url) { - for (const item of exceptions.url) if (item == url.href) return true - for (const item of exceptions.regex) if (new RegExp(item).test(url.href)) return true + if (url !== undefined) { + for (const item of exceptions.url) if (item == url.href) return true + for (const item of exceptions.regex) if (new RegExp(item).test(url.href)) return true + } return false } diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index eb2a665e..c536851d 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -725,17 +725,11 @@ function initDefaults() { function upgradeOptions() { return new Promise(async resolve => { - const oldOptions = await utils.getOptions() + let options = await utils.getOptions() const config = await utils.getConfig() - let options = {} - options = [...oldOptions] options.fetchInstances = 'github' - for (service in config.services) { - options[service].unsupportedUrls = 'bypass' - } - browser.storage.local.clear(() => { browser.storage.local.set({ options }, () => { resolve() |