From 8c5b233a77de59594ff368e9bbc0a8878b3f8557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?User=20Rog=C3=A9rio=20Gon=C3=A7alves?=
 <rogerio.rag@gmail.com>
Date: Wed, 25 Jan 2012 13:42:53 +0100
Subject: [PATCH] Bug 719850 - Web Console should be checked according to the
 selected tab. r=dao

---
 browser/base/content/browser-appmenu.inc   | 3 ++-
 browser/base/content/browser-menubar.inc   | 3 ++-
 browser/base/content/browser.js            | 6 ++++++
 browser/devtools/webconsole/HUDService.jsm | 4 ----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index be8a5c4e246..34eb9847d02 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -176,7 +176,8 @@
       <menuseparator class="appmenu-menuseparator"/>
       <menu id="appmenu_webDeveloper"
             label="&appMenuWebDeveloper.label;">
-        <menupopup id="appmenu_webDeveloper_popup">
+        <menupopup id="appmenu_webDeveloper_popup"
+                   onpopupshowing="onWebDeveloperMenuShowing();">
           <menuitem id="appmenu_webConsole"
                     label="&webConsoleCmd.label;"
                     type="checkbox"
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index bf73096397c..2abd30eaaf6 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -531,7 +531,8 @@
               <menu id="webDeveloperMenu"
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
-                <menupopup id="menuWebDeveloperPopup">
+                <menupopup id="menuWebDeveloperPopup"
+                           onpopupshowing="onWebDeveloperMenuShowing();">
                   <menuitem id="webConsole"
                             type="checkbox"
                             label="&webConsoleCmd.label;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ac7bb915050..44c73695469 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -9060,6 +9060,11 @@ var StyleEditor = {
   }
 };
 
+function onWebDeveloperMenuShowing() {
+  document.getElementById("Tools:WebConsole").setAttribute("checked", HUDConsoleUI.getOpenHUD() != null);
+}
+
+
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
   // Only show resizers on Windows 2000 and XP
@@ -9134,6 +9139,7 @@ var MousePosTracker = {
     }
   }
 };
+
 function focusNextFrame(event) {
   let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
   let dir = event.shiftKey ? fm.MOVEFOCUS_BACKWARDDOC : fm.MOVEFOCUS_FORWARDDOC;
diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index 54aa541b9ed..934930d012b 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -1552,8 +1552,6 @@ 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.
@@ -1603,8 +1601,6 @@ 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.