mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-08-27 17:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

no-bug: Fixed loading bar appearing twice (gh-13337)

Browse Source
This commit is contained in:
mr. m
2026-04-21 01:18:48 +02:00
committed by GitHub
parent 1f77fe2ea7
commit 014eabed3c
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/zen/common/sys/ui/ZenProgressBar.sys.mjs
View File

@@ -10,6 +10,7 @@ export class ZenProgressBar extends ZenUIComponent {
#element = null;
#loadingTab = null;
#longLoadTimer = null;
#promise = null;
init() {
this.listenBrowserTabsProgress();
@@ -60,7 +61,8 @@ export class ZenProgressBar extends ZenUIComponent {
return this.#element;
}
#checkBrowserProgress(webProgress) {
async #checkBrowserProgress(webProgress) {
await this.#promise;
const window = this.window;
const gBrowser = window.gBrowser;
const tab = gBrowser.getTabForBrowser(webProgress);
@@ -74,7 +76,7 @@ export class ZenProgressBar extends ZenUIComponent {
}
}
#hideProgressBar() {
#hideProgressBar(aInstant = false) {
const progressBar = this.#element;
const window = this.window;
if (this.#longLoadTimer) {
@@ -86,12 +88,15 @@ export class ZenProgressBar extends ZenUIComponent {
if (!progressBar) {
return;
}
let { promise, resolve } = Promise.withResolvers();
this.#promise = promise;
const callback = () => {
delete progressBar._loadingTab;
progressBar.remove();
this.#element = null;
resolve();
};
if (this.window.gReduceMotion) {
if (this.window.gReduceMotion || aInstant) {
callback();
return;
}
@@ -113,6 +118,11 @@ export class ZenProgressBar extends ZenUIComponent {
if (this.#loadingTab === aTab) {
return;
}
if (this.#element) {
return;
}
let { promise, resolve } = Promise.withResolvers();
this.#promise = promise;
this.#loadingTab = aTab;
const progressBar = this.#progressBar;
progressBar.removeAttribute("fade-out");
@@ -123,5 +133,6 @@ export class ZenProgressBar extends ZenUIComponent {
}
this.#longLoadTimer = null;
}, WAIT_BEFORE_SHOWING_LONG_LOAD);
resolve();
}
}