wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 514915 - gProgressCollapseTimer and gProgressMeterPanel shouldn't exist. r=mano

Browse Source
This commit is contained in:
Dão Gottwald 2009-10-06 14:34:25 +02:00
parent 5ab4177f82
commit 6e62d9df06
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/base/content/browser.js
View File

@ -74,7 +74,6 @@ var gLastBrowserCharset = null;
var gPrevCharset = null;
var gProxyFavIcon = null;
var gLastValidURLStr = "";
var gProgressCollapseTimer = null;
var gInPrintPreviewMode = false;
let gDownloadMgr = null;
@ -93,7 +92,6 @@ var gEditUIVisible = true;
["gNavToolbox", "navigator-toolbox"],
["gURLBar", "urlbar"],
["gNavigatorBundle", "bundle_browser"],
["gProgressMeterPanel", "statusbar-progresspanel"],
["gFindBar", "FindToolbar"]
].forEach(function (elementGlobal) {
var [name, id] = elementGlobal;
@ -3828,7 +3826,7 @@ var XULBrowserWindow = {
lastURI: null,
isBusy: false,
statusTimeoutInEffect: false,
_progressCollapseTimer: 0,
QueryInterface: function (aIID) {
if (aIID.equals(Ci.nsIWebProgressListener) ||
@ -3977,9 +3975,9 @@ var XULBrowserWindow = {
// Turn the status meter on.
this.statusMeter.value = 0; // be sure to clear the progress bar
if (gProgressCollapseTimer) {
window.clearTimeout(gProgressCollapseTimer);
gProgressCollapseTimer = null;
if (this._progressCollapseTimer) {
clearTimeout(this._progressCollapseTimer);
this._progressCollapseTimer = 0;
}
else
this.statusMeter.parentNode.collapsed = false;
@ -4044,10 +4042,10 @@ var XULBrowserWindow = {
this._busyUI = false;
// Turn the progress meter and throbber off.
gProgressCollapseTimer = window.setTimeout(function () {
gProgressMeterPanel.collapsed = true;
gProgressCollapseTimer = null;
}, 100);
this._progressCollapseTimer = setTimeout(function (self) {
self.statusMeter.parentNode.collapsed = true;
self._progressCollapseTimer = 0;
}, 100, this);
if (this.throbberElement)
this.throbberElement.removeAttribute("busy");