mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Preferences: Separate load and show, fix navigation race condition

Browse source 
Now we give the caller control over whether the pane should still be
shown after it loads. We're fine with showing in all cases when handling
a search, but we don't want to show when handling a navigation select
if the user already selected something else while the pane was still
loading.

Fixes #4357
This commit is contained in:
Abe Jellinek 2024-07-08 16:38:58 -04:00
parent a80c4c46bd
commit c2b51c7dfe
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
chrome/content/zotero/preferences/preferences.js
View file

@ -148,6 +148,13 @@ var Zotero_Preferences = {
let pane = this.panes.get(paneID);
document.getElementById('prefs-search').value = '';
await this._search('');
await this._loadPane(paneID);
if (this.navigation.value !== paneID) {
// User navigated away from this pane while it was loading
return;
}
await this._showPane(paneID);
this.content.scrollTop = 0;
@ -323,16 +330,14 @@ var Zotero_Preferences = {
/**
* Display a pane's content, alongside any other panes already showing.
* If the pane is not yet loaded, it will be loaded first.
*
* Pane must be loaded (#_loadPane()).
* @param {String} id
* @return {Promise<void>}
*/
async _showPane(id) {
await this._loadPane(id);
_showPane(id) {
let pane = this.panes.get(id);
if (!pane.loaded) {
throw new Error(`Pane '${id}' not loaded`);
}
pane.container.hidden = false;
for (let child of pane.container.children) {
let event = new Event('showing');
@ -629,6 +634,7 @@ ${str}
pane.container.hidden = true;
}
else {
await this._loadPane(id);
await this._showPane(id);
}
}