diff options
Diffstat (limited to '')
| -rw-r--r-- | src/assets/javascripts/services.js | 18 | ||||
| -rw-r--r-- | src/pages/popup/popup.js | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index af3e2380..a102a297 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -73,7 +73,7 @@ function redirect(url, type, initiator) { if (!regexArray(service, url, config)) continue
if (initiator) {
if (targets.test(initiator.host)) continue
- if (all(service, null, options, config, redirects).includes(initiator.origin)) return "BYPASSTAB"
+ if (all(service, null, options, config, redirects).includes(initiator.origin) && reverse(initiator) == url) return "BYPASSTAB"
}
if (Object.keys(config.services[service].frontends).length > 1) {
@@ -715,19 +715,19 @@ function processUpdate() { for (const defaultOption in config.services[service].options) if (!options[service][defaultOption]) options[service][defaultOption] = config.services[service].options[defaultOption]
for (const frontend in config.services[service].frontends) {
if (config.services[service].frontends[frontend].instanceList) {
+ if (!options[frontend]) options[frontend] = {}
for (const network in config.networks) {
if (!options[frontend][network]) {
options[frontend][network] = {}
options[frontend][network].enabled = JSON.parse(data)[frontend][network]
options[frontend][network].custom = []
- }
- }
- if (!options[service][frontend]) {
- options[frontend] = {}
- 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)
+ if (network == "clearnet") {
+ 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)
+ }
+ }
}
}
}
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index ed1546c7..a4b73093 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -81,7 +81,7 @@ browser.storage.local.get("options", r => { let service = await serviceHelper.computeService(url, true) let frontend if (service) { - if (service[0]) { + if (typeof service != "string") { frontend = service[1] service = service[0] } |