www

commit d4727521011d2299dc4bccbb669abf0961f1ae23
parent 850a9bb309617969155fdc1fa3b829b3fb729d96
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 19 Apr 2017 21:48:08 -0400

Collapse My Publications when first opened

Child items marked as visible are technically search matches, so we have
to take extra steps to keep the parents from being auto-expanded.

Diffstat:
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
20
+++++++++++++-------
M
chrome/content/zotero/zoteroPane.js
 | 
2
+-

2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -64,6 +64,7 @@ Zotero.ItemTreeView.prototype = Object.create(Zotero.LibraryTreeView.prototype);
 Zotero.ItemTreeView.prototype.type = 'item';
 Zotero.ItemTreeView.prototype.regularOnly = false;
 Zotero.ItemTreeView.prototype.expandAll = false;
+Zotero.ItemTreeView.prototype.collapseAll = false;
 
 
 /**
@@ -114,13 +115,13 @@ Zotero.ItemTreeView.prototype.setTree = Zotero.Promise.coroutine(function* (tree
 			return;
 		}
 		
-		yield this.refresh();
+		yield this.refresh(true);
 		if (!this._treebox.treeBody) {
 			return;
 		}
 		
-		// Expand all parent items for some views (e.g., My Publications). We do this here instead of
-		// refresh so that it doesn't get reverted after item changes.
+		// Expand all parent items in the view, regardless of search matches. We do this here instead
+		// of refresh so that it doesn't get reverted after item changes.
 		if (this.expandAll) {
 			var t = new Date();
 			for (let i = 0; i < this._rows.length; i++) {
@@ -245,7 +246,9 @@ Zotero.ItemTreeView.prototype.setTree = Zotero.Promise.coroutine(function* (tree
 		tree._handleEnter = function () {};
 		
 		this.sort();
-		this.expandMatchParents();
+		if (!this.collapseAll) {
+			this.expandMatchParents();
+		}
 		
 		if (this._ownerDocument.defaultView.ZoteroPane_Local) {
 			// For My Publications, show intro text in middle pane if no items
@@ -343,7 +346,7 @@ Zotero.ItemTreeView.prototype.setSortColumn = function() {
  *  Reload the rows from the data access methods
  *  (doesn't call the tree.invalidate methods, etc.)
  */
-Zotero.ItemTreeView.prototype.refresh = Zotero.serial(Zotero.Promise.coroutine(function* () {
+Zotero.ItemTreeView.prototype.refresh = Zotero.serial(Zotero.Promise.coroutine(function* (skipExpandMatchParents) {
 	Zotero.debug('Refreshing items list for ' + this.id);
 	
 	// DEBUG: necessary?
@@ -433,7 +436,9 @@ Zotero.ItemTreeView.prototype.refresh = Zotero.serial(Zotero.Promise.coroutine(f
 		
 		this.rememberOpenState(savedOpenState);
 		this.rememberSelection(savedSelection);
-		this.expandMatchParents();
+		if (!skipExpandMatchParents) {
+			this.expandMatchParents();
+		}
 		if (unsuppress) {
 			this._treebox.endUpdateBatch();
 			this.selection.selectEventsSuppressed = false;
@@ -670,7 +675,8 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
 		if (collectionTreeRow.isSearch()
 				|| collectionTreeRow.isPublications()
 				|| collectionTreeRow.isTrash()) {
-			yield this.refresh();
+			let skipExpandMatchParents = collectionTreeRow.isPublications();
+			yield this.refresh(skipExpandMatchParents);
 			refreshed = true;
 			madeChanges = true;
 			sort = true;
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -1238,7 +1238,7 @@ var ZoteroPane = new function()
 			
 			this.itemsView = new Zotero.ItemTreeView(collectionTreeRow);
 			if (collectionTreeRow.isPublications()) {
-				this.itemsView.expandAll = true;
+				this.itemsView.collapseAll = true;
 			}
 			this.itemsView.onError = function () {
 				// Don't reload last folder, in case that's the problem