www

commit 27f6f018d379941b3294a45f3dd7ff15fc83f593
parent 12bea4b7eaadd4ce44a73cead4fb41b94dc7a233
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 23 Jun 2015 16:31:40 -0400

Remove Zotero.suppressUIUpdates

Now handled by notifier flags

Diffstat:
M
chrome/content/zotero/xpcom/collectionTreeView.js
 | 
15
---------------
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
10
----------
M
chrome/content/zotero/xpcom/zotero.js
 | 
5
-----

3 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -873,11 +873,6 @@ Zotero.CollectionTreeView.prototype.expandToCollection = Zotero.Promise.coroutin
 ///
 ////////////////////////////////////////////////////////////////////////////////
 Zotero.CollectionTreeView.prototype.selectByID = Zotero.Promise.coroutine(function* (id) {
-	if (Zotero.suppressUIUpdates) {
-		Zotero.debug("UI updates suppressed -- not changing selection");
-		return false;
-	}
-	
 	var type = id[0];
 	id = ('' + id).substr(1);
 	
@@ -922,11 +917,6 @@ Zotero.CollectionTreeView.prototype.restoreSelection = Zotero.Promise.coroutine(
  * @param	{Integer}		libraryID		Library to select
  */
 Zotero.CollectionTreeView.prototype.selectLibrary = Zotero.Promise.coroutine(function* (libraryID) {
-	if (Zotero.suppressUIUpdates) {
-		Zotero.debug("UI updates suppressed -- not changing library selection");
-		return false;
-	}
-	
 	// Select local library
 	if (!libraryID) {
 		this._treebox.ensureRowIsVisible(0);
@@ -966,11 +956,6 @@ Zotero.CollectionTreeView.prototype.selectSearch = function (id) {
 
 
 Zotero.CollectionTreeView.prototype.selectTrash = Zotero.Promise.coroutine(function* (libraryID) {
-	if (Zotero.suppressUIUpdates) {
-		Zotero.debug("UI updates suppressed -- not changing library selection");
-		return false;
-	}
-	
 	// Check if trash is already selected
 	if (this.selection.currentIndex != -1) {
 		let itemGroup = this.getRow(this.selection.currentIndex);
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -917,10 +917,6 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
 		yield this.selectItem(selectItem);
 	}*/
 	
-	if (Zotero.suppressUIUpdates) {
-		yield this.rememberSelection(savedSelection);
-	}
-	
 	//this._treebox.endUpdateBatch();
 	if (madeChanges) {
 		var deferred = Zotero.Promise.defer();
@@ -1601,12 +1597,6 @@ Zotero.ItemTreeView.prototype.sort = Zotero.Promise.coroutine(function* (itemID)
  *  Select an item
  */
 Zotero.ItemTreeView.prototype.selectItem = Zotero.Promise.coroutine(function* (id, expand, noRecurse) {
-	// Don't change selection if UI updates are disabled (e.g., during sync)
-	if (Zotero.suppressUIUpdates) {
-		Zotero.debug("Sync is running; not selecting item");
-		return false;
-	}
-	
 	// If no row map, we're probably in the process of switching collections,
 	// so store the item to select on the item group for later
 	if (!this._rowMap) {
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -99,11 +99,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	});
 	
 	/**
-	 * @property	{Boolean}	suppressUIUpdates	Don't update UI on Notifier triggers
-	 */
-	this.suppressUIUpdates = false;
-	
-	/**
 	 * @property	{Boolean}	closing		True if the application is closing.
 	 */
 	this.closing = false;