www

commit 062ff185961e1f0da196172e93858d5b8c79c3bc
parent 06ad369368a0bec62f1cb63e3b03bb250ea72630
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 16 Nov 2016 01:05:22 -0500

Don't clear Zotero pane progress meter message by default

If showZoteroPaneProgressMeter() is called with the first argument
undefined, don't clear any existing message. To clear, pass
null/false/"". The message is also cleared when the progress meter is
hidden.

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -108,6 +108,7 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	
 	var _locked = false;
 	var _shutdownListeners = [];
+	var _progressMessage;
 	var _progressMeters;
 	var _progressPopup;
 	var _lastPercentage;
@@ -2257,7 +2258,9 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	 * @return	void
 	 */
 	this.showZoteroPaneProgressMeter = function (msg, determinate, icon) {
-		if (!msg) msg = "";
+		// If msg is undefined, keep any existing message. If false/null/"", clear.
+		// The message is also cleared when the meters are hidden.
+		_progressMessage = msg = (msg === undefined ? _progressMessage : msg) || "";
 		var currentWindow = Services.wm.getMostRecentWindow("navigator:browser");
 		var enumerator = Services.wm.getEnumerator("navigator:browser");
 		var progressMeters = [];
@@ -2357,6 +2360,7 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 			_progressPopup.close();
 		}
 		
+		_progressMessage = null;
 		_progressMeters = [];
 		_progressPopup = null;
 		_lastPercentage = null;