suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix slow citation dialog initialization

Browse Source 
Report: https://forums.zotero.org/discussion/69929/beta-delay-citation-feature
This commit is contained in:
Adomas Venčkauskas 2018-01-24 16:03:19 +02:00
parent 8544618445
commit 2523bca659
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chrome/content/zotero/xpcom/integration.js
View File

@ -1133,26 +1133,30 @@ Zotero.Integration.Fields.prototype.addEditCitation = Zotero.Promise.coroutine(f
// ------------------- // -------------------
// Preparing stuff to pass into CitationEditInterface // Preparing stuff to pass into CitationEditInterface
var fields = yield this.get(); var fieldIndexPromise = this.get().then(function(fields) {
for (var fieldIndex = 0; fieldIndex < fields.length; fieldIndex++) { for (var i=0, n=fields.length; i<n; i++) {
if (fields[fieldIndex].equals(field._field)) { if (fields[i].equals(field._field)) {
// This is needed, because LibreOffice integration plugin caches the field code instead of asking // This is needed, because LibreOffice integration plugin caches the field code instead of asking
// the document every time when calling #getCode(). // the document every time when calling #getCode().
field._field = fields[fieldIndex]; field._field = fields[i];
break; return i;
}
} }
} });
var citationsByItemIDPromise; var citationsByItemIDPromise;
if (this._session.data.prefs.delayCitationUpdates) { if (this._session.data.prefs.delayCitationUpdates) {
citationsByItemIDPromise = Zotero.Promise.resolve(this._session.citationsByItemID); citationsByItemIDPromise = Zotero.Promise.resolve(this._session.citationsByItemID);
} else { } else {
citationsByItemIDPromise = this.updateSession(FORCE_CITATIONS_FALSE).then(function() { citationsByItemIDPromise = fieldIndexPromise.then(function() {
return this.updateSession(FORCE_CITATIONS_FALSE);
}.bind(this)).then(function() {
return this._session.citationsByItemID; return this._session.citationsByItemID;
}.bind(this)); }.bind(this));
} }
var previewFn = Zotero.Promise.coroutine(function* (citation) { var previewFn = Zotero.Promise.coroutine(function* (citation) {
let idx = yield fieldIndexPromise;
yield citationsByItemIDPromise; yield citationsByItemIDPromise;
let citations = this._session.getCiteprocLists(); let citations = this._session.getCiteprocLists();
@ -1167,7 +1171,7 @@ Zotero.Integration.Fields.prototype.addEditCitation = Zotero.Promise.coroutine(f
var io = new Zotero.Integration.CitationEditInterface( var io = new Zotero.Integration.CitationEditInterface(
citation, this._session.style.opt.sort_citations, citation, this._session.style.opt.sort_citations,
fieldIndex, citationsByItemIDPromise, previewFn fieldIndexPromise, citationsByItemIDPromise, previewFn
); );
if (Zotero.Prefs.get("integration.useClassicAddCitationDialog")) { if (Zotero.Prefs.get("integration.useClassicAddCitationDialog")) {
@ -1194,6 +1198,7 @@ Zotero.Integration.Fields.prototype.addEditCitation = Zotero.Promise.coroutine(f
throw new Zotero.Exception.UserCancelled("inserting citation"); throw new Zotero.Exception.UserCancelled("inserting citation");
} }
var fieldIndex = yield fieldIndexPromise;
this._session.updateIndices[fieldIndex] = true; this._session.updateIndices[fieldIndex] = true;
// Make sure session is updated // Make sure session is updated
yield citationsByItemIDPromise; yield citationsByItemIDPromise;
@ -1203,11 +1208,11 @@ Zotero.Integration.Fields.prototype.addEditCitation = Zotero.Promise.coroutine(f
/** /**
* Citation editing functions and propertiesaccessible to quickFormat.js and addCitationDialog.js * Citation editing functions and propertiesaccessible to quickFormat.js and addCitationDialog.js
*/ */
Zotero.Integration.CitationEditInterface = function(citation, sortable, fieldIndex, citationsByItemIDPromise, previewFn) { Zotero.Integration.CitationEditInterface = function(citation, sortable, fieldIndexPromise, citationsByItemIDPromise, previewFn) {
this.citation = citation; this.citation = citation;
this.sortable = sortable; this.sortable = sortable;
this.previewFn = previewFn; this.previewFn = previewFn;
this._fieldIndex = fieldIndex; this._fieldIndexPromise = fieldIndexPromise;
this._citationsByItemIDPromise = citationsByItemIDPromise; this._citationsByItemIDPromise = citationsByItemIDPromise;
// Not available in quickFormat.js if this unspecified // Not available in quickFormat.js if this unspecified
@ -1250,13 +1255,14 @@ Zotero.Integration.CitationEditInterface.prototype = {
* @return {Promise} A promise resolved by the items * @return {Promise} A promise resolved by the items
*/ */
getItems: Zotero.Promise.coroutine(function* () { getItems: Zotero.Promise.coroutine(function* () {
var fieldIndex = yield this._fieldIndexPromise;
var citationsByItemID = yield this._citationsByItemIDPromise; var citationsByItemID = yield this._citationsByItemIDPromise;
var ids = Object.keys(citationsByItemID).filter(itemID => { var ids = Object.keys(citationsByItemID).filter(itemID => {
return citationsByItemID[itemID] return citationsByItemID[itemID]
&& citationsByItemID[itemID].length && citationsByItemID[itemID].length
// Exclude the present item // Exclude the present item
&& (citationsByItemID[itemID].length > 1 && (citationsByItemID[itemID].length > 1
|| citationsByItemID[itemID][0].properties.zoteroIndex !== this._fieldIndex); || citationsByItemID[itemID][0].properties.zoteroIndex !== fieldIndex);
}); });
// Sort all previously cited items at top, and all items cited later at bottom // Sort all previously cited items at top, and all items cited later at bottom
@ -1264,12 +1270,12 @@ Zotero.Integration.CitationEditInterface.prototype = {
var indexA = citationsByItemID[a][0].properties.zoteroIndex, var indexA = citationsByItemID[a][0].properties.zoteroIndex,
indexB = citationsByItemID[b][0].properties.zoteroIndex; indexB = citationsByItemID[b][0].properties.zoteroIndex;
if(indexA >= this._fieldIndex){ if (indexA >= fieldIndex){
if(indexB < this._fieldIndex) return 1; if(indexB < fieldIndex) return 1;
return indexA - indexB; return indexA - indexB;
} }
if(indexB > this._fieldIndex) return -1; if (indexB > fieldIndex) return -1;
return indexB - indexA; return indexB - indexA;
}); });