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

Update menu for non-collections when right-clicking on unselected row

Browse source 
Previously, item-dependent menu options in the context menu of
collectionsTreeRow types other than 'collection' weren't updated after
the asynchronous loading of the items. The menu is now updated for all
types, so, e.g., "Empty Trash" is now updated properly after items in
the trash have been loaded.
This commit is contained in:
Dan Stillman 2016-05-12 02:12:22 -04:00
parent 16a58c03be
commit 8bbde63284
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2303,7 +2303,18 @@ var ZoteroPane = new function()
}
this.buildCollectionContextMenu = function () {
this.buildCollectionContextMenu = function (noRepeat) {
var collectionTreeRow = this.collectionsView.selectedTreeRow;
// If the items view isn't initialized, this was a right-click on a different collection and
// the new collection's items are still loading, so update the menu after loading. This causes
// some menu items (e.g., export/createBib/loadReport) to appear gray in the menu at first and
// then turn black once there are items. Pass a flag to prevent an accidental infinite loop.
if (!collectionTreeRow.isHeader() && !this.itemsView.initialized && !noRepeat) {
this.itemsView.addEventListener('load', function () {
this.buildCollectionContextMenu(true);
}.bind(this));
}
var options = [
"newCollection",
"newSavedSearch",
@ -2334,8 +2345,6 @@ var ZoteroPane = new function()
var menu = document.getElementById('zotero-collectionmenu');
var collectionTreeRow = this.collectionsView.selectedTreeRow;
// By default things are hidden and visible, so we only need to record
// when things are visible and when they're visible but disabled
var show = [], disable = [];
@ -2355,15 +2364,6 @@ var ZoteroPane = new function()
var s = [m.exportCollection, m.createBibCollection, m.loadReport];
if (!this.itemsView.rowCount) {
// If no items, it might be because this was a right-click on a different collection
// and the new collection's items are still loading, so update the menu after loading.
// This causes export/createBib/loadReport to appear gray in the menu at first and then
// turn black once there are items.
if (!this.itemsView.initialized) {
this.itemsView.addEventListener('load', function () {
this.buildCollectionContextMenu();
}.bind(this));
}
disable = s;
}