diff options
| author | Hygna <hygna@proton.me> | 2022-10-09 13:11:05 +0100 |
|---|---|---|
| committer | Hygna <hygna@proton.me> | 2022-10-09 13:11:05 +0100 |
| commit | 375f4371c3c5e703b07ae3e3d677315134a035ce (patch) | |
| tree | f9168e19cf33e0a01e53b0fb72f3436e5db74ae3 /src/assets/javascripts | |
| parent | Changed order of Mirror repos (diff) | |
| download | libredirect-375f4371c3c5e703b07ae3e3d677315134a035ce.zip | |
Toggle current instance in popup
Fixed bug where testing latency of multiple frontends at the same time wouldn't save all of the timings
Diffstat (limited to 'src/assets/javascripts')
| -rw-r--r-- | src/assets/javascripts/services.js | 4 | ||||
| -rw-r--r-- | src/assets/javascripts/utils.js | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index 80a1ac45..806624d7 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -422,7 +422,7 @@ function computeService(url, returnFrontend) { } else {
for (const frontend in config.services[service].frontends) {
if (all(service, frontend, options, config, redirects).includes(utils.protocolHost(url))) {
- if (returnFrontend) resolve([service, frontend, url.hostname])
+ if (returnFrontend) resolve([service, frontend, utils.protocolHost(url)])
else resolve(service)
return
}
@@ -520,7 +520,7 @@ function unifyPreferences(url, tabId) { const frontendObject = config.services[service].frontends[frontend]
if ("cookies" in frontendObject.preferences) {
for (const cookie of frontendObject.preferences.cookies) {
- utils.copyCookie(frontendObject, url, instancesList, cookie)
+ await utils.copyCookie(frontendObject, url, instancesList, cookie)
}
}
if ("localstorage" in frontendObject.preferences) {
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js index 9ae9123f..62041690 100644 --- a/src/assets/javascripts/utils.js +++ b/src/assets/javascripts/utils.js @@ -424,17 +424,20 @@ function latency(service, frontend, document, location) { latencyElement.addEventListener("click", async () => { let reloadWindow = () => location.reload() latencyElement.addEventListener("click", reloadWindow) - browser.storage.local.get(["redirects", "latency"], r => { + browser.storage.local.get("redirects", r => { let redirects = r.redirects - let latency = r.latency const oldHtml = latencyLabel.innerHTML latencyLabel.innerHTML = "..." testLatency(latencyLabel, redirects[frontend].clearnet, frontend).then(r => { - latency[frontend] = r - browser.storage.local.set({ latency }) - latencyLabel.innerHTML = oldHtml - processDefaultCustomInstances(service, frontend, "clearnet", document) - latencyElement.removeEventListener("click", reloadWindow) + const frontendLatency = r + browser.storage.local.get("latency", r => { + let latency = r.latency + latency[frontend] = frontendLatency + browser.storage.local.set({ latency }) + latencyLabel.innerHTML = oldHtml + processDefaultCustomInstances(service, frontend, "clearnet", document) + latencyElement.removeEventListener("click", reloadWindow) + }) }) }) }) |