From 469d689f3769a221a8c8b081f187f57bb8a44634 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 10 Feb 2017 14:11:10 -0500 Subject: [PATCH] Fix emptying from trash (broken in 7ede52355d) Zotero.Items.eraseTx() doesn't exist -- use Zotero.Items.erase() instead --- chrome/content/zotero/recognizePDF.js | 2 +- chrome/content/zotero/xpcom/itemTreeView.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/recognizePDF.js b/chrome/content/zotero/recognizePDF.js index 8d8a71c7b4..d90319ea8d 100644 --- a/chrome/content/zotero/recognizePDF.js +++ b/chrome/content/zotero/recognizePDF.js @@ -390,7 +390,7 @@ var Zotero_RecognizePDF = new function() { // If already stopped, delete if (this._stopped) { - yield Zotero.Items.eraseTx(newItem.id); + yield Zotero.Items.erase(newItem.id); throw new Zotero.Exception.Alert('recognizePDF.stopped'); } diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js index 316ea58882..7a48da92c2 100644 --- a/chrome/content/zotero/xpcom/itemTreeView.js +++ b/chrome/content/zotero/xpcom/itemTreeView.js @@ -1882,7 +1882,7 @@ Zotero.ItemTreeView.prototype.deleteSelection = Zotero.Promise.coroutine(functio collectionTreeRow.ref.deleteItems(ids); } else if (collectionTreeRow.isTrash() || collectionTreeRow.isPublications()) { - yield Zotero.Items.eraseTx(ids); + yield Zotero.Items.erase(ids); } else if (collectionTreeRow.isLibrary(true) || force) { yield Zotero.Items.trashTx(ids);