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

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@84671 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blakeross%telocity.com
2001-01-09 21:49:02 +00:00
parent 438eddd2c4
commit 5923da1d77
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/modules/oji/public/nsIJVMManager.idl
View File

@@ -84,6 +84,11 @@ interface nsIJVMManager : nsISupports {
*/
void IsJavaEnabled(out boolean outEnabled);
/**
* Returns whether or not Java is enabled.
*/
boolean JavaEnabled();
/**
* Called from Java Console menu item.
*/

8
mozilla/modules/oji/src/nsJVMManager.cpp
View File

@@ -151,6 +151,14 @@ nsJVMManager::IsJavaEnabled(PRBool* outEnabled)
return NS_OK;
}
NS_METHOD
nsJVMManager::JavaEnabled(PRBool* outEnabled)
{
nsJVMStatus status = GetJVMStatus();
*outEnabled = (status == nsJVMStatus_Enabled || status == nsJVMStatus_Running);
return NS_OK;
}
NS_METHOD
nsJVMManager::ShowJavaConsole(void)
{

27
mozilla/xpfe/communicator/resources/content/tasksOverlay.js
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 )

4
mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
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>