Change to preloadAbbreviations function signature

Juris-M · Feb 10, 2017 · 72bfdbe · 72bfdbe
1 parent ea683d6
commit 72bfdbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
@@ -430,7 +430,7 @@ var Zotero_File_Interface = new function() {
 		};
 
 		if (Zotero.CiteProc.CSL.preloadAbbreviations) {
-			yield Zotero.CiteProc.CSL.preloadAbbreviations(cslEngine.opt.styleID, cslEngine.transform.abbrevs, citation);
+			yield Zotero.CiteProc.CSL.preloadAbbreviations(cslEngine, citation);
 		}
 
 		if (asCitations) {
@@ -459,7 +459,7 @@ var Zotero_File_Interface = new function() {
 				cslEngine = style.getCiteProc(locale, null, true);
 				// Load external abbreviations to the new processor instance
 				if (Zotero.CiteProc.CSL.preloadAbbreviations) {
-					yield Zotero.CiteProc.CSL.preloadAbbreviations(cslEngine.opt.styleID, cslEngine.transform.abbrevs, citation);
+					yield Zotero.CiteProc.CSL.preloadAbbreviations(cslEngine, citation);
 				}
 				output = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, "text");
 			}
@@ -520,7 +520,7 @@ var Zotero_File_Interface = new function() {
 						citationItems: items.map(item => ({ id: item.id })),
 						properties: {}
 					};
-					yield Zotero.CiteProc.CSL.preloadAbbreviations(cslEngine.opt.styleID, cslEngine.transform.abbrevs, citation);
+					yield Zotero.CiteProc.CSL.preloadAbbreviations(cslEngine, citation);
 				}
 				var bibliography = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine,
 					items, format, io.mode === "citations");

diff --git a/chrome/content/zotero/tools/csledit.js b/chrome/content/zotero/tools/csledit.js
@@ -197,7 +197,7 @@ var Zotero_CSL_Editor = new function() {
 		var citations = '<h3>' + Zotero.getString('styles.editor.output.individualCitations') + '</h3>';
 
 		if (Zotero.CiteProc.CSL.preloadAbbreviations) {
-			yield Zotero.CiteProc.CSL.preloadAbbreviations(styleEngine.opt.styleID, styleEngine.transform.abbrevs, citation);
+			yield Zotero.CiteProc.CSL.preloadAbbreviations(styleEngine, citation);
 		}
 
 		for (var i=0; i<citation.citationItems.length; i++) {

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -2000,7 +2000,7 @@ Zotero.Integration.CitationEditInterface.prototype = {
 		var me = this;
 		return this._updateSession().then(function* () {
 			if (Zotero.CiteProc.CSL.preloadAbbreviations) {
-				yield Zotero.CiteProc.CSL.preloadAbbreviations(this.style.opt.styleID, this.style.transform.abbrevs, me.citation);
+				yield Zotero.CiteProc.CSL.preloadAbbreviations(this.style, me.citation);
 			}
 			me.citation.properties.zoteroIndex = me._fieldIndex;
 			me.citation.properties.noteIndex = me._field.getNoteIndex();
@@ -2765,7 +2765,7 @@ Zotero.Integration.Session.prototype.formatCitation = Zotero.Promise.coroutine(f
 			Zotero.debug("Integration: style.processCitationCluster("+citation.toSource()+", "+citationsPre.toSource()+", "+citationsPost.toSource());
 		}
 		if (Zotero.CiteProc.CSL.preloadAbbreviations) {
-			yield Zotero.CiteProc.CSL.preloadAbbreviations(this.style.opt.styleID, this.style.transform.abbrevs, citation);
+			yield Zotero.CiteProc.CSL.preloadAbbreviations(this.style, citation);
 		}
 		var newCitations = this.style.processCitationCluster(citation, citationsPre, citationsPost);
 		for (let newCitation of newCitations[1]) {