Bug 583218 - "Web Console" menu item should be checked when the Web Console is open. Additional fixes by Rogério Gonçalves. r=dao

This commit is contained in:
Lucio Valentin 2012-01-11 15:32:39 +01:00
parent c307e21899
commit 31dd002a2e
4 changed files with 11 additions and 4 deletions

View File

@ -179,7 +179,8 @@
<menupopup id="appmenu_webDeveloper_popup">
<menuitem id="appmenu_webConsole"
label="&webConsoleCmd.label;"
oncommand="HUDConsoleUI.toggleHUD();"
type="checkbox"
command="Tools:WebConsole"
key="key_webConsole"/>
<menuitem id="appmenu_pageInspect"
hidden="true"

View File

@ -533,10 +533,11 @@
accesskey="&webDeveloperMenu.accesskey;">
<menupopup id="menuWebDeveloperPopup">
<menuitem id="webConsole"
type="checkbox"
label="&webConsoleCmd.label;"
accesskey="&webConsoleCmd.accesskey;"
key="key_webConsole"
oncommand="HUDConsoleUI.toggleHUD();"/>
command="Tools:WebConsole"/>
<menuitem id="menu_pageinspect"
type="checkbox"
hidden="true"

View File

@ -125,6 +125,7 @@
<command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
<command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
<command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
<command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
<command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true"/>
<command id="Tools:StyleEditor" oncommand="StyleEditor.openChrome();" disabled="true"/>

View File

@ -1511,8 +1511,8 @@ HUD_SERVICE.prototype =
this.wakeup();
let window = aContext.linkedBrowser.contentWindow;
let nBox = aContext.ownerDocument.defaultView.
getNotificationBox(window);
let chromeDocument = aContext.ownerDocument;
let nBox = chromeDocument.defaultView.getNotificationBox(window);
this.registerActiveContext(nBox.id);
this.windowInitializer(window);
@ -1523,6 +1523,8 @@ HUD_SERVICE.prototype =
this.disableAnimation(hudId);
}
chromeDocument.getElementById("Tools:WebConsole").setAttribute("checked", "true");
// Create a processing instruction for GCLIs CSS stylesheet, but only if
// we don't have one for this document. Also record the context we're
// adding this for so we know when to remove it.
@ -1572,6 +1574,8 @@ HUD_SERVICE.prototype =
window.focus();
}
chromeDocument.getElementById("Tools:WebConsole").setAttribute("checked", "false");
// Remove this context from the list of contexts that need the GCLI CSS
// processing instruction and then remove the processing instruction if it
// isn't needed any more.