Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 133250: "Transferring data from..." remains on status bar. Checkin for antonio.xu@sun.com

Browse Source 
r=jkeiser sr=rpotts


git-svn-id: svn://10.0.0.236/trunk@124456 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com 2002-07-02 02:17:15 +00:00
parent b2e652332c
commit a085cb323a
3 changed files with 72 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/uriloader/base/nsDocLoader.cpp
View File

@ -917,6 +917,14 @@ nsDocLoaderImpl::GetDOMWindow(nsIDOMWindow **aResult)
return rv;
}
NS_IMETHODIMP
nsDocLoaderImpl::GetIsLoadingDocument(PRBool *aIsLoadingDocument)
{
*aIsLoadingDocument = mIsLoadingDocument;
return NS_OK;
}
nsresult nsDocLoaderImpl::GetMaxTotalProgress(PRInt32 *aMaxTotalProgress)
{
PRUint32 count = 0;

5
mozilla/uriloader/base/nsIWebProgress.idl
View File

@ -80,4 +80,9 @@ interface nsIWebProgress : nsISupports
* The DOM Window associated with the WebProgress instance.
*/
readonly attribute nsIDOMWindow DOMWindow;
/**
* The IsLoadingDocument associated with the WebProgress instance
*/
readonly attribute PRBool isLoadingDocument;
};

85
mozilla/xpfe/browser/resources/content/nsBrowserStatusHandler.js
View File

@ -217,11 +217,19 @@ nsBrowserStatusHandler.prototype =
const nsIChannel = Components.interfaces.nsIChannel;
var ctype;
if (aStateFlags & nsIWebProgressListener.STATE_START) {
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
// If this is a network start or the first stray request (the first
// request outside of the document load), initialize the throbber and his
// friends.
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK ||
(aStateFlags & nsIWebProgressListener.STATE_IS_REQUEST &&
!aWebProgress.isLoadingDocument &&
this.totalRequests == this.finishedRequests)) {
// Remember when loading commenced.
this.startTime = (new Date()).getTime();
this.startTime = Date.now();
if (aRequest && aWebProgress.DOMWindow == content)
// Call start document load listeners (only if this is a network load)
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK &&
aRequest && aWebProgress.DOMWindow == content)
this.startDocumentLoad(aRequest);
// Turn the throbber on.
@ -248,40 +256,65 @@ nsBrowserStatusHandler.prototype =
if (!this.useRealProgressFlag)
this.onProgressChange(null, null, 0, 0, this.finishedRequests, this.totalRequests);
}
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
if (aRequest) {
if (aWebProgress.DOMWindow == content)
this.endDocumentLoad(aRequest, aStatus);
}
}
var location = aRequest.QueryInterface(nsIChannel).URI.spec;
// If this is a network stop or the last request stop outside of loading
// the document, stop throbbers and progress bars and such
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK ||
(aStateFlags & nsIWebProgressListener.STATE_IS_REQUEST &&
!aWebProgress.isLoadingDocument &&
this.totalRequests == this.finishedRequests)) {
if (aRequest) {
var msg = "";
if (location != "about:blank") {
const kErrorBindingAborted = 2152398850;
const kErrorNetTimeout = 2152398862;
switch (aStatus) {
case kErrorBindingAborted:
msg = gNavigatorBundle.getString("nv_stopped");
break;
case kErrorNetTimeout:
msg = gNavigatorBundle.getString("nv_timeout");
break;
default:
// Record page loading time.
var elapsed = ((new Date()).getTime() - this.startTime) / 1000;
msg = gNavigatorBundle.getString("nv_done");
msg = msg.replace(/%elapsed%/, elapsed);
// Get the channel if the request is a channel
var channel;
try {
channel = aRequest.QueryInterface(nsIChannel);
}
catch(e) { };
if (channel) {
var location = channel.URI.spec;
if (location != "about:blank") {
const kErrorBindingAborted = 2152398850;
const kErrorNetTimeout = 2152398862;
switch (aStatus) {
case kErrorBindingAborted:
msg = gNavigatorBundle.getString("nv_stopped");
break;
case kErrorNetTimeout:
msg = gNavigatorBundle.getString("nv_timeout");
break;
}
}
}
// If msg is false then we did not have an error (channel may have
// been null, in the case of a stray image load).
if (!msg) {
// Record page loading time.
var elapsed = (Date.now() - this.startTime) / 1000;
msg = gNavigatorBundle.getString("nv_done");
msg = msg.replace(/%elapsed%/, elapsed);
}
this.status = "";
this.setDefaultStatus(msg);
try {
ctype = aRequest.QueryInterface(nsIChannel).contentType;
if (this.mimeTypeIsTextBased(ctype))
this.isImage.removeAttribute('disabled');
else
this.isImage.setAttribute('disabled', 'true');
if (channel) {
try {
ctype = channel.contentType;
if (this.mimeTypeIsTextBased(ctype))
this.isImage.removeAttribute('disabled');
else
this.isImage.setAttribute('disabled', 'true');
}
catch (e) {}
}
catch (e) {}
}
// Turn the progress meter and throbber off.