зеркало из https://github.com/mozilla/pjs.git
More 100706 fun. r/sr=jst,jag
This commit is contained in:
Родитель
4fff55e04d
Коммит
f0ea19744a
|
@ -404,9 +404,7 @@ function Shutdown()
|
|||
browser.boxObject.removeProperty("listenerkungfu");
|
||||
|
||||
try {
|
||||
var interfaceRequestor = browser.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
|
||||
var webProgress = interfaceRequestor.getInterface(Components.interfaces.nsIWebProgress);
|
||||
webProgress.removeProgressListener(window.XULBrowserWindow);
|
||||
getBrowser().removeProgressListener(window.XULBrowserWindow);
|
||||
} catch (ex) {
|
||||
}
|
||||
|
||||
|
|
|
@ -148,9 +148,6 @@ nsBrowserStatusHandler.prototype =
|
|||
|
||||
onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
|
||||
{
|
||||
if (!aRequest)
|
||||
return;
|
||||
|
||||
//ignore local/resource:/chrome: files
|
||||
if (aStatus == NS_NET_STATUS_READ_FROM || aStatus == NS_NET_STATUS_WROTE_TO)
|
||||
return;
|
||||
|
@ -164,7 +161,7 @@ nsBrowserStatusHandler.prototype =
|
|||
this.startTime = (new Date()).getTime();
|
||||
|
||||
domWindow = aWebProgress.DOMWindow;
|
||||
if (domWindow == _content)
|
||||
if (aRequest && domWindow == _content)
|
||||
this.startDocumentLoad(aRequest);
|
||||
|
||||
// Turn progress meter on.
|
||||
|
@ -194,19 +191,21 @@ nsBrowserStatusHandler.prototype =
|
|||
}
|
||||
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
|
||||
domWindow = aWebProgress.DOMWindow;
|
||||
if (domWindow == domWindow.top)
|
||||
this.endDocumentLoad(aRequest, aStatus);
|
||||
if (aRequest) {
|
||||
if (domWindow == domWindow.top)
|
||||
this.endDocumentLoad(aRequest, aStatus);
|
||||
|
||||
var location = aRequest.QueryInterface(nsIChannel).URI.spec;
|
||||
var msg = "";
|
||||
if (location != "about:blank") {
|
||||
// Record page loading time.
|
||||
var elapsed = ((new Date()).getTime() - this.startTime) / 1000;
|
||||
msg = gNavigatorBundle.getString("nv_done");
|
||||
msg = msg.replace(/%elapsed%/, elapsed);
|
||||
var location = aRequest.QueryInterface(nsIChannel).URI.spec;
|
||||
var msg = "";
|
||||
if (location != "about:blank") {
|
||||
// Record page loading time.
|
||||
var elapsed = ((new Date()).getTime() - this.startTime) / 1000;
|
||||
msg = gNavigatorBundle.getString("nv_done");
|
||||
msg = msg.replace(/%elapsed%/, elapsed);
|
||||
}
|
||||
this.status = "";
|
||||
this.setDefaultStatus(msg);
|
||||
}
|
||||
this.status = "";
|
||||
this.setDefaultStatus(msg);
|
||||
|
||||
// Turn progress meter off.
|
||||
this.statusMeter.mode = "normal";
|
||||
|
|
Загрузка…
Ссылка в новой задаче