diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index 6579441db..4e2177a57 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -1484,10 +1484,11 @@ var ZoteroPane = new function() /* * Remove, trash, or delete item(s), depending on context * - * @param {Boolean} [force=false] Trash or delete even if in a collection or search, - * or trash without prompt in library + * @param {Boolean} [force=false] Trash or delete even if in a collection or search, + * or trash without prompt in library + * @param {Boolean} [fromMenu=false] If triggered from context menu, which always prompts for deletes */ - this.deleteSelectedItems = function (force) { + this.deleteSelectedItems = function (force, fromMenu) { if (!this.itemsView || !this.itemsView.selection.count) { return; } @@ -1513,7 +1514,7 @@ var ZoteroPane = new function() if (itemGroup.isLibrary(true)) { // In library, don't prompt if meta key was pressed - var prompt = force ? false : toTrash; + var prompt = (force && !fromMenu) ? false : toTrash; } else if (itemGroup.isCollection()) { // In collection, only prompt if trashing diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul index 45a0f29d3..f56c301c5 100644 --- a/chrome/content/zotero/zoteroPane.xul +++ b/chrome/content/zotero/zoteroPane.xul @@ -274,7 +274,7 @@ - +