Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-12 06:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

checking in patch for bug 122144 again because the backout had no visible impact on Txul times.

Browse Source
This commit is contained in:
cbiesinger%web.de 2006-09-14 06:02:48 +00:00
parent f40eea7b05
commit 3986f82b85
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
suite/browser/navigatorOverlay.xul
View File

@ -244,7 +244,7 @@
<menuitem accesskey="&pageInfoCmd.accesskey;" label="&pageInfoCmd.label;" key="key_viewInfo" command="View:PageInfo"/>
<menuseparator />
<menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" oncommand="Translate();"/>
<menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" id="menuitem-translate" oncommand="Translate();"/>
<menu label="&webContentMenu.label;" accesskey="&webContentMenu.accesskey;">
<menupopup datasources="rdf:chrome" ref="urn:mozilla:locale:root"
sortResource="http://www.mozilla.org/rdf/chrome#name"

9
suite/browser/nsBrowserStatusHandler.js
View File

@ -109,6 +109,7 @@ nsBrowserStatusHandler.prototype =
this.stopMenu = document.getElementById("menuitem-stop");
this.stopContext = document.getElementById("context-stop");
this.statusTextField = document.getElementById("statusbar-display");
this.translateMenu = document.getElementById("menuitem-translate");
},
@ -122,6 +123,7 @@ nsBrowserStatusHandler.prototype =
this.stopMenu = null;
this.stopContext = null;
this.statusTextField = null;
this.translateMenu = null;
this.userTyped = null;
},
@ -198,6 +200,7 @@ nsBrowserStatusHandler.prototype =
const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
const nsIChannel = Components.interfaces.nsIChannel;
var domWindow;
var ctype;
if (aStateFlags & nsIWebProgressListener.STATE_START) {
if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
// Remember when loading commenced.
@ -214,6 +217,7 @@ nsBrowserStatusHandler.prototype =
this.stopButton.disabled = false;
this.stopMenu.removeAttribute('disabled');
this.stopContext.removeAttribute('disabled');
this.translateMenu.removeAttribute('disabled');
// Initialize the progress stuff...
this.useRealProgressFlag = false;
@ -247,6 +251,9 @@ nsBrowserStatusHandler.prototype =
}
this.status = "";
this.setDefaultStatus(msg);
ctype = aRequest.QueryInterface(nsIChannel).contentType;
if (ctype.match(/^image\//))
this.translateMenu.setAttribute('disabled', 'true');
}
// Turn the progress meter and throbber off.
@ -263,7 +270,7 @@ nsBrowserStatusHandler.prototype =
}
else if (aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) {
if (aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) {
var ctype = aRequest.QueryInterface(nsIChannel).contentType;
ctype = aRequest.QueryInterface(nsIChannel).contentType;
if (ctype != "text/html")
this.useRealProgressFlag = true;