www

commit 8bbde6328463bf1dfc06dfe21e9efaad507131a6
parent 16a58c03be41d4868438ed2c775f1f8b66c2db96
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 12 May 2016 02:12:22 -0400

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

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.

Diffstat:
M
chrome/content/zotero/zoteroPane.js
 | 
24
++++++++++++------------

1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -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;
 			}