mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Don't show "Remove Item from Collection" for child items

Browse source 
Test forthcoming once tests are working again
This commit is contained in:
Dan Stillman 2017-05-27 18:38:28 -04:00
parent aa05920117
commit 5d16352f57
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/zoteroPane.js
View file

@ -2721,12 +2721,13 @@ var ZoteroPane = new function()
show.push(m.sep3, m.exportItems, m.createBib, m.loadReport); show.push(m.sep3, m.exportItems, m.createBib, m.loadReport);
} }
if (this.itemsView.selection.count > 0) { var items = this.getSelectedItems();
if (items.length > 0) {
// Multiple items selected // Multiple items selected
if (this.itemsView.selection.count > 1) { if (items.length.count > 1) {
var multiple = '.multiple'; var multiple = '.multiple';
var items = this.getSelectedItems();
var canMerge = true, canIndex = true, canRecognize = true, canRename = true; var canMerge = true, canIndex = true, canRecognize = true, canRename = true;
var canMarkRead = collectionTreeRow.isFeed(); var canMarkRead = collectionTreeRow.isFeed();
var markUnread = true; var markUnread = true;
@ -2821,7 +2822,7 @@ var ZoteroPane = new function()
// Single item selected // Single item selected
else else
{ {
let item = this.getSelectedItems()[0]; let item = items[0];
menu.setAttribute('itemID', item.id); menu.setAttribute('itemID', item.id);
menu.setAttribute('itemKey', item.key); menu.setAttribute('itemKey', item.key);
@ -2934,7 +2935,7 @@ var ZoteroPane = new function()
} }
// Remove from collection // Remove from collection
if (collectionTreeRow.isCollection() && (!item || item.isTopLevelItem())) { if (collectionTreeRow.isCollection() && items.every(item => item.isTopLevelItem())) {
menu.childNodes[m.removeItems].setAttribute('label', Zotero.getString('pane.items.menu.remove' + multiple)); menu.childNodes[m.removeItems].setAttribute('label', Zotero.getString('pane.items.menu.remove' + multiple));
show.push(m.removeItems); show.push(m.removeItems);
} }