Fix 61474: disable Java Console item in Tasks menu when Java plugin isn't installed. patch mostly by Xiaobin Lu (xiaobin.lu@eng.sun.com). r=blake a=ben

This commit is contained in:
blakeross%telocity.com 2006-07-29 05:35:32 +00:00
parent 8025ca67b6
commit ae4aeeb4f0
2 changed files with 18 additions and 13 deletions

View File

@ -21,9 +21,12 @@
* Peter Annema <disttsc@bart.nl>
*/
var gJVMMgr = Components.classes['@mozilla.org/oji/jvm-mgr;1']
.getService(Components.interfaces.nsIJVMManager)
function toNavigator()
{
CycleWindow('navigator:browser', getBrowserURL());
CycleWindow('navigator:browser', getBrowserURL());
}
// Set up a lame hack to avoid opening two bookmarks.
@ -63,20 +66,22 @@ function toHistory()
function toJavaScriptConsole()
{
toOpenWindowByType("global:console", "chrome://global/content/console.xul");
toOpenWindowByType("global:console", "chrome://global/content/console.xul");
}
function javaItemEnabling()
{
var enabled = gJVMMgr.JavaEnabled();
var element = document.getElementById("java");
if (enabled)
element.removeAttribute("disabled");
else
element.setAttribute("disabled", "true");
}
function toJavaConsole()
{
try{
var cid =
Components.classes['@mozilla.org/oji/jvm-mgr;1'];
var iid = Components.interfaces.nsIJVMManager;
var jvmMgr = cid.getService(iid);
jvmMgr.ShowJavaConsole();
} catch(e) {
}
gJVMMgr.ShowJavaConsole();
}
function toOpenWindowByType( inType, uri )

View File

@ -133,10 +133,10 @@
<menuseparator/>
<menu value="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
<menupopup id="toolsPopup">
<menupopup id="toolsPopup" oncreate="javaItemEnabling();">
<menuitem value="&historyCmd.label;" accesskey="&historyCmd.accesskey;" oncommand="toHistory()" key="key_gotoHistory"/>
<menuitem value="&importUtilCmd.label;" accesskey="&importUtilCmd.accesskey;" oncommand="toImport()"/>
<menuitem value="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
<menuitem id="java" value="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
<menuitem value="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
</menupopup>
</menu>