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

Integration: Don't activate document after clicking Manage Styles in Doc Prefs

Browse source 
Closes #4290
This commit is contained in:
Adomas Venčkauskas 2024-06-27 10:09:23 +03:00
parent d5bb667fb3
commit 87f7a6a7bd
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chrome/content/zotero/bibliography.js
View file

@ -324,6 +324,7 @@ var Zotero_File_Interface_Bibliography = new function() {
this.manageStyles = function () { this.manageStyles = function () {
_io.dontActivateDocument = true;
document.querySelector('dialog').cancelDialog(); document.querySelector('dialog').cancelDialog();
var win = Zotero.Utilities.Internal.openPreferences('zotero-prefpane-cite', { var win = Zotero.Utilities.Internal.openPreferences('zotero-prefpane-cite', {
scrollTo: '#styles' scrollTo: '#styles'

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

@ -329,7 +329,9 @@ Zotero.Integration = new function() {
if (document) { if (document) {
try { try {
await document.cleanup(); await document.cleanup();
await document.activate(); if (!Zotero.Integration.currentSession._dontActivateDocument) {
await document.activate();
}
// Call complete function if one exists // Call complete function if one exists
if (document.complete) { if (document.complete) {
@ -956,6 +958,7 @@ Zotero.Integration.Session = function(doc, app) {
this.primaryFieldType = app.primaryFieldType; this.primaryFieldType = app.primaryFieldType;
this.secondaryFieldType = app.secondaryFieldType; this.secondaryFieldType = app.secondaryFieldType;
this.outputFormat = app.outputFormat || 'rtf'; this.outputFormat = app.outputFormat || 'rtf';
this._dontActivateDocument = false;
this._sessionUpToDate = false; this._sessionUpToDate = false;
this._app = app; this._app = app;
@ -1889,6 +1892,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = async function (showImportExp
} }
if (!io.style || !io.fieldType) { if (!io.style || !io.fieldType) {
this._dontActivateDocument = io.dontActivateDocument;
throw new Zotero.Exception.UserCancelled("document preferences window"); throw new Zotero.Exception.UserCancelled("document preferences window");
} }