From c2b51c7dfec99ec0c63b1198d3e2decf1141d29e Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Mon, 8 Jul 2024 16:38:58 -0400 Subject: [PATCH] Preferences: Separate load and show, fix navigation race condition 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 --- .../content/zotero/preferences/preferences.js | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js index 8a29c060a9..94c8dd1b4f 100644 --- a/chrome/content/zotero/preferences/preferences.js +++ b/chrome/content/zotero/preferences/preferences.js @@ -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} */ - 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); } }