From edd2d935de766870ee706452fe0793929db7489b Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Thu, 14 Sep 2006 06:04:52 +0000 Subject: [PATCH] bug 92947 r=timeless sr=jag Better feedback when components of a page do not download --- suite/browser/nsBrowserStatusHandler.js | 19 +++++++++++++++---- .../en-US/chrome/browser/navigator.properties | 2 ++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/suite/browser/nsBrowserStatusHandler.js b/suite/browser/nsBrowserStatusHandler.js index f54aea2e3027..254c0a3266e3 100644 --- a/suite/browser/nsBrowserStatusHandler.js +++ b/suite/browser/nsBrowserStatusHandler.js @@ -256,10 +256,21 @@ nsBrowserStatusHandler.prototype = 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); + 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); + } } this.status = ""; this.setDefaultStatus(msg); diff --git a/suite/locales/en-US/chrome/browser/navigator.properties b/suite/locales/en-US/chrome/browser/navigator.properties index 4249783864cc..cda06679b207 100644 --- a/suite/locales/en-US/chrome/browser/navigator.properties +++ b/suite/locales/en-US/chrome/browser/navigator.properties @@ -1,4 +1,6 @@ nv_done=Document: Done (%elapsed% secs) +nv_timeout=Timed Out +nv_stopped=Stopped openFile=Open File defaultStatus=