www

commit 773a93f55d77f4cb91161480b666ca9cfdacba4a
parent d4569d3640a63c80d89f9d38ee08ddb59e663daf
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat,  7 Oct 2017 05:05:34 -0400

Fix item selection that requires switching to library root

Broken in c7639f328fa

Diffstat:
M
chrome/content/zotero/xpcom/collectionTreeView.js
 | 
9
++++-----
M
test/tests/collectionTreeViewTest.js
 | 
14
++++++++++++--

2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -1180,10 +1180,9 @@ Zotero.CollectionTreeView.prototype.selectItem = Zotero.Promise.coroutine(functi
 		yield this.selectLibrary(item.libraryID);
 	}
 	
-	var itemTreeView = this.itemTreeView;
-	yield itemTreeView.waitForLoad();
+	yield this.itemTreeView.waitForLoad();
 	
-	var selected = yield itemTreeView.selectItem(itemID, expand);
+	var selected = yield this.itemTreeView.selectItem(itemID, expand);
 	if (selected) {
 		return true;
 	}
@@ -1197,9 +1196,9 @@ Zotero.CollectionTreeView.prototype.selectItem = Zotero.Promise.coroutine(functi
 		yield this.selectLibrary(item.libraryID);
 	}
 	
-	yield itemTreeView.waitForLoad();
+	yield this.itemTreeView.waitForLoad();
 	
-	return itemTreeView.selectItem(itemID, expand);
+	return this.itemTreeView.selectItem(itemID, expand);
 });
 
 
diff --git a/test/tests/collectionTreeViewTest.js b/test/tests/collectionTreeViewTest.js
@@ -481,8 +481,18 @@ describe("Zotero.CollectionTreeView", function() {
 			yield win.ZoteroPane.deleteSelectedCollection();
 			assert.isFalse(cv.getRowIndexByID(id))
 		})
-		
-	})
+	});
+	
+	describe("#selectItem()", function () {
+		it("should switch to library root if item isn't in collection", async function () {
+			var item = await createDataObject('item');
+			var collection = await createDataObject('collection');
+			await cv.selectItem(item.id);
+			await waitForItemsLoad(win);
+			assert.equal(cv.selection.currentIndex, 0);
+			assert.sameMembers(zp.itemsView.getSelectedItems(), [item]);
+		});
+	});
 	
 	describe("#drop()", function () {
 		/**