aboutsummaryrefslogtreecommitdiffstats
path: root/src/assets
diff options
context:
space:
mode:
Diffstat (limited to 'src/assets')
-rw-r--r--src/assets/javascripts/general.js6
-rw-r--r--src/assets/javascripts/services.js10
2 files changed, 6 insertions, 10 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 88d04512..c536851d 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -685,7 +685,7 @@ const defaultInstances = {
'suds': ['https://sd.vern.cc'],
'waybackClassic': ['https://wayback-classic.net'],
'gothub': ['https://gh.odyssey346.dev'],
- 'mikuIndividious': ['https://mikuinv.resrv.org'],
+ 'mikuInvidious': ['https://mikuinv.resrv.org'],
"tent": ['https://tent.sny.sh'],
"wolfreeAlpha": ['https://gqq.gitlab.io', 'https://uqq.gitlab.io']
}
@@ -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()