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

Fix citation dialog not appearing until fields are fetched on macWord

Browse source 
Closes #4679
This commit is contained in:
Adomas Venčkauskas 2024-09-12 13:20:16 +03:00
parent 01017e7d63
commit 6504c95d24
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/integration.js
View file

@ -439,7 +439,16 @@ Zotero.Integration = new function() {
*/
this.displayDialog = async function displayDialog(url, options, io) {
Zotero.debug(`Integration: Displaying dialog ${url}`);
await Zotero.Integration.currentDoc.cleanup();
// On macOS (and potentially in the future with Word JS)
// we can only run request sequentially (native async field fetching was dropped
// with fx102 due to ctypes crashing when passing a callback function) which means
// that the webWorker thread is blocked while fetching fields.
// We are technically fetching them asynchronously and open the citation dialog
// while they are being fetched. However, if we await this cleanup call here
// the display of the dialog is blocked until fields are fetched and it is able to run.
// So we make sure cleanup is finished before the dialog is closed, but otherwise
// we should not delay the dialog display
let cleanupPromise = Zotero.Integration.currentDoc.cleanup();
Zotero.Integration.currentSession && await Zotero.Integration.currentSession.progressBar.hide(true);
var allOptions = 'chrome,centerscreen';
@ -470,6 +479,7 @@ Zotero.Integration = new function() {
window.addEventListener("unload", listener, false);
await deferred.promise;
await cleanupPromise;
// We do not want to redisplay the progress bar if this window close
// was the final close of the integration command
await Zotero.Promise.delay(10);