From 62e2ccafa0e551893ae35a955cb73b3adeeb11c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Tue, 5 Oct 2021 10:35:21 +0300 Subject: [PATCH] Replace deprecated usage of Utilities.itemToCSLJSON --- chrome/content/zotero/xpcom/cite.js | 2 +- chrome/content/zotero/xpcom/editorInstance.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js index 46819e6a36..35a1fb08c0 100644 --- a/chrome/content/zotero/xpcom/cite.js +++ b/chrome/content/zotero/xpcom/cite.js @@ -541,7 +541,7 @@ Zotero.Cite.System.prototype = { throw new Error("Zotero.Cite.System.retrieveItem called on non-item "+item); } - var cslItem = Zotero.Utilities.itemToCSLJSON(zoteroItem); + var cslItem = Zotero.Utilities.Item.itemToCSLJSON(zoteroItem); // TEMP: citeproc-js currently expects the id property to be the item DB id cslItem.id = zoteroItem.id; diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js index 2ede0c7252..80e16d0db8 100644 --- a/chrome/content/zotero/xpcom/editorInstance.js +++ b/chrome/content/zotero/xpcom/editorInstance.js @@ -355,7 +355,7 @@ class EditorInstance { // Note: integration.js` uses `Zotero.Cite.System.prototype.retrieveItem`, // which produces a little bit different CSL JSON - let itemData = Zotero.Utilities.itemToCSLJSON(parentItem); + let itemData = Zotero.Utilities.Item.itemToCSLJSON(parentItem); if (!skipEmbeddingItemData) { citationItem.itemData = itemData; } @@ -432,7 +432,7 @@ class EditorInstance { for (let item of items) { if (item.isRegularItem()) { - let itemData = Zotero.Utilities.itemToCSLJSON(item); + let itemData = Zotero.Utilities.Item.itemToCSLJSON(item); let citation = { citationItems: [{ uris: [Zotero.URI.getItemURI(item)], @@ -715,7 +715,7 @@ class EditorInstance { let citationItem = {}; citationItem.id = item.id; citationItem.uris = [Zotero.URI.getItemURI(item)]; - citationItem.itemData = Zotero.Utilities.itemToCSLJSON(item); + citationItem.itemData = Zotero.Utilities.Item.itemToCSLJSON(item); citation.citationItems.push(citationItem); } } @@ -767,7 +767,7 @@ class EditorInstance { for (let { uris } of citationItemsList) { let item = await Zotero.EditorInstance.getItemFromURIs(uris); if (item) { - let itemData = Zotero.Utilities.itemToCSLJSON(item); + let itemData = Zotero.Utilities.Item.itemToCSLJSON(item); citationItems.push({ uris, itemData }); } } @@ -1277,7 +1277,7 @@ class EditorInstance { else if (citationItem.id) { let item = await Zotero.Items.getAsync(parseInt(citationItem.id)); citationItem.uris = [Zotero.URI.getItemURI(item)]; - citationItem.itemData = Zotero.Utilities.itemToCSLJSON(item); + citationItem.itemData = Zotero.Utilities.Item.itemToCSLJSON(item); } // Otherwise it's existing item, so just passing untouched citationItem