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

Be less aggressive about sending Zotero to back after http integration commands

Browse source 
Report https://forums.zotero.org/discussion/109479/bug-after-adding-citation-main-window-is-hidden-76
This commit is contained in:
Adomas Venčkauskas 2023-11-21 10:34:36 +02:00
parent 7027c08f1a
commit 9d710ea135
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -309,15 +309,25 @@ Zotero.Integration = new function() {
finally {
var diff = ((new Date()).getTime() - startTime)/1000;
Zotero.debug(`Integration: ${agent}-${command}${docId ? `:'${docId}'` : ''} complete in ${diff}s`)
if (Zotero.Integration.currentWindow && !Zotero.Integration.currentWindow.closed) {
var oldWindow = Zotero.Integration.currentWindow;
oldWindow.close();
await Zotero.Promise.delay(50);
}
if (Zotero.Integration.currentSession && Zotero.Integration.currentSession.progressBar) {
Zotero.Integration.currentSession.progressBar.hide();
await Zotero.Promise.delay(50);
}
if (document) {
try {
await document.cleanup();
await document.activate();
// Call complete function if one exists
if (document.wrappedJSObject && document.wrappedJSObject.complete) {
document.wrappedJSObject.complete();
} else if (document.complete) {
if (document.complete) {
await document.complete();
}
} catch(e) {
@ -325,18 +335,6 @@ Zotero.Integration = new function() {
}
}
if(Zotero.Integration.currentWindow && !Zotero.Integration.currentWindow.closed) {
var oldWindow = Zotero.Integration.currentWindow;
Zotero.Promise.delay(100).then(function() {
oldWindow.close();
});
}
if (Zotero.Integration.currentSession && Zotero.Integration.currentSession.progressBar) {
Zotero.Promise.delay(5).then(function() {
Zotero.Integration.currentSession.progressBar.hide();
});
}
// This technically shouldn't be necessary since we call document.activate(),
// but http integration plugins may not have OS level access to windows to be
// able to activate themselves. E.g. Google Docs on Safari.