Merge pull request #680 from rmzelle/update-remove-from-collection

No prompt for remove if no top-level items are selected
This commit is contained in:
Dan Stillman 2015-03-21 22:18:06 -04:00
commit df7cd60a43

View File

@ -1610,7 +1610,13 @@ var ZoteroPane = new function()
var prompt = (force && !fromMenu) ? false : toTrash;
}
else if (itemGroup.isCollection()) {
// In collection, only prompt if trashing
// Ignore unmodified action if only child items are selected
if (!force && this.itemsView.getSelectedItems().every(item => !item.isTopLevelItem())) {
return;
}
// In collection
var prompt = force ? toTrash : toRemove;
}
else if (itemGroup.isSearch() || itemGroup.isUnfiled() || itemGroup.isDuplicates()) {