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

Prevent citation merging from being always enabled after refreshing the doc

Browse source
This commit is contained in:
Adomas Venčkauskas 2022-11-09 11:07:45 +02:00
parent 13ab3de1a1
commit 1920a5efd7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -505,6 +505,7 @@ Zotero.Integration = new function() {
session._removeCodeFields = {};
session._deleteFields = {};
session._bibliographyFields = [];
session._shouldMerge = false;
if (dataString == EXPORTED_DOCUMENT_MARKER) {
Zotero.Integration.currentSession = session;
@ -799,7 +800,7 @@ Zotero.Integration.Interface.prototype.addEditBibliography = Zotero.Promise.coro
*/
Zotero.Integration.Interface.prototype.refresh = async function() {
await this._session.init(true, false);
this._session.shouldMerge = true;
this._session._shouldMerge = true;
this._session.reload = this._session.reload || this._session.data.prefs.delayCitationUpdates;
await this._session.updateFromDocument(FORCE_CITATIONS_REGENERATE);
@ -1081,7 +1082,7 @@ Zotero.Integration.Session.prototype._processFields = async function () {
data = await field.unserialize(),
citation = new Zotero.Integration.Citation(field, data, noteIndex);
if (this.shouldMerge && typeof field.isAdjacentToNextField === 'function' && await field.isAdjacentToNextField()) {
if (this._shouldMerge && typeof field.isAdjacentToNextField === 'function' && await field.isAdjacentToNextField()) {
adjacentCitations.push(citation);
this._deleteFields[i] = true;
continue;