suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't clear Zotero pane progress meter message by default

Browse Source 
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.
This commit is contained in:
Dan Stillman 2016-11-16 01:05:22 -05:00
parent 06ad369368
commit 062ff18596
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrome/content/zotero/xpcom/zotero.js
View File

@ -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;