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

backing out patch for bug 122144 because Txul is 1% up

Browse Source 
a=shaver


git-svn-id: svn://10.0.0.236/trunk@211069 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2006-09-14 06:02:45 +00:00
parent b63b05d736
commit 225d39a01a
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/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;" id="menuitem-translate" oncommand="Translate();"/>
<menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" 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
mozilla/suite/browser/nsBrowserStatusHandler.js
View File

@@ -109,7 +109,6 @@ 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");
},
@@ -123,7 +122,6 @@ nsBrowserStatusHandler.prototype =
this.stopMenu = null;
this.stopContext = null;
this.statusTextField = null;
this.translateMenu = null;
this.userTyped = null;
},
@@ -200,7 +198,6 @@ 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.
@@ -217,7 +214,6 @@ 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;
@@ -251,9 +247,6 @@ 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.
@@ -270,7 +263,7 @@ nsBrowserStatusHandler.prototype =
}
else if (aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) {
if (aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) {
ctype = aRequest.QueryInterface(nsIChannel).contentType;
var ctype = aRequest.QueryInterface(nsIChannel).contentType;
if (ctype != "text/html")
this.useRealProgressFlag = true;