corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 776254 - Keyboard Shortcut Ctrl+Shift+J (Open Error Console) does not work in 21 July Nightly build. r=dao

Browse Source
This commit is contained in:
Paul Rouget
2012-07-23 12:00:06 -07:00
parent b80f36ef2c
commit e0c39c039c
2 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
browser/base/content/browser-sets.inc
View File

@@ -88,17 +88,18 @@
<command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/> <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
<command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/> <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
<command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();"/> <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true" hidden="true"/>
<command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focus();" disabled="true"/> <command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focus();" disabled="true"/>
<command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/> <command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
<command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();"/> <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true" hidden="true"/>
<command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();"/> <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();" disabled="true" hidden="true"/>
<command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();"/> <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();" disabled="true" hidden="true"/>
<command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();"/> <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();" disabled="true" hidden="true"/>
<command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();"/> <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true" hidden="true"/>
<command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();"/> <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();" disabled="true" hidden="true"/>
<command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();"/> <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();" disabled="true" hidden="true"/>
<command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/> <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
<command id="Tools:ErrorConsole" oncommand="toJavaScriptConsole()" disabled="true" hidden="true"/>
<command id="Tools:Sanitize" <command id="Tools:Sanitize"
oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/> oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
<command id="Tools:PrivateBrowsing" oncommand="gPrivateBrowsingUI.toggleMode();"/> <command id="Tools:PrivateBrowsing" oncommand="gPrivateBrowsingUI.toggleMode();"/>
@@ -189,8 +190,7 @@
label="&devToolbarMenu.label;" label="&devToolbarMenu.label;"
type="checkbox" autocheck="false" type="checkbox" autocheck="false"
command="Tools:DevToolbar" command="Tools:DevToolbar"
key="key_devToolbar" key="key_devToolbar"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_WebConsole" <broadcaster id="devtoolsMenuBroadcaster_WebConsole"
label="&webConsoleCmd.label;" label="&webConsoleCmd.label;"
type="checkbox" autocheck="false" type="checkbox" autocheck="false"
@@ -200,48 +200,40 @@
label="&inspectMenu.label;" label="&inspectMenu.label;"
type="checkbox" autocheck="false" type="checkbox" autocheck="false"
command="Tools:Inspect" command="Tools:Inspect"
key="key_inspect" key="key_inspect"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_Debugger" <broadcaster id="devtoolsMenuBroadcaster_Debugger"
label="&debuggerMenu.label2;" label="&debuggerMenu.label2;"
type="checkbox" autocheck="false" type="checkbox" autocheck="false"
command="Tools:Debugger" command="Tools:Debugger"
key="key_debugger" key="key_debugger"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_RemoteDebugger" <broadcaster id="devtoolsMenuBroadcaster_RemoteDebugger"
label="&remoteDebuggerMenu.label;" label="&remoteDebuggerMenu.label;"
command="Tools:RemoteDebugger" command="Tools:RemoteDebugger"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_ChromeDebugger" <broadcaster id="devtoolsMenuBroadcaster_ChromeDebugger"
label="&chromeDebuggerMenu.label;" label="&chromeDebuggerMenu.label;"
command="Tools:ChromeDebugger" command="Tools:ChromeDebugger"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_Scratchpad" <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
label="&scratchpad.label;" label="&scratchpad.label;"
command="Tools:Scratchpad" command="Tools:Scratchpad"
key="key_scratchpad" key="key_scratchpad"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_StyleEditor" <broadcaster id="devtoolsMenuBroadcaster_StyleEditor"
label="&styleeditor.label;" label="&styleeditor.label;"
type="checkbox" autocheck="false" type="checkbox" autocheck="false"
command="Tools:StyleEditor" command="Tools:StyleEditor"
key="key_styleeditor" key="key_styleeditor"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI" <broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI"
label="&responsiveDesignTool.label;" label="&responsiveDesignTool.label;"
type="checkbox" autocheck="false" type="checkbox" autocheck="false"
command="Tools:ResponsiveUI" command="Tools:ResponsiveUI"
key="key_responsiveUI" key="key_responsiveUI"/>
disabled="true" hidden="true"/>
<broadcaster id="devtoolsMenuBroadcaster_PageSource" <broadcaster id="devtoolsMenuBroadcaster_PageSource"
label="&pageSourceCmd.label;" label="&pageSourceCmd.label;"
key="key_viewSource" key="key_viewSource"
command="View:PageSource"/> command="View:PageSource"/>
<broadcaster id="devtoolsMenuBroadcaster_ErrorConsole" <broadcaster id="devtoolsMenuBroadcaster_ErrorConsole"
hidden="true"
label="&errorConsoleCmd.label;" label="&errorConsoleCmd.label;"
key="key_errorConsole" key="key_errorConsole"
oncommand="toJavaScriptConsole();"/> command="Tools:ErrorConsole"/>
<broadcaster id="devtoolsMenuBroadcaster_GetMoreTools" <broadcaster id="devtoolsMenuBroadcaster_GetMoreTools"
label="&getMoreDevtoolsCmd.label;" label="&getMoreDevtoolsCmd.label;"
oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/> oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
@@ -291,7 +283,7 @@
<key id="key_openDownloads" key="&downloads.commandkey;" command="Tools:Downloads" modifiers="accel"/> <key id="key_openDownloads" key="&downloads.commandkey;" command="Tools:Downloads" modifiers="accel"/>
#endif #endif
<key id="key_openAddons" key="&addons.commandkey;" command="Tools:Addons" modifiers="accel,shift"/> <key id="key_openAddons" key="&addons.commandkey;" command="Tools:Addons" modifiers="accel,shift"/>
<key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/> <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" command="Tools:ErrorConsole" modifiers="accel,shift"/>
<key id="key_devToolbar" keycode="&devToolbar.keycode;" modifiers="shift" <key id="key_devToolbar" keycode="&devToolbar.keycode;" modifiers="shift"
keytext="&devToolbar.keytext;" command="Tools:DevToolbarFocus"/> keytext="&devToolbar.keytext;" command="Tools:DevToolbarFocus"/>
<key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();"

54
browser/base/content/browser.js
View File

@@ -1402,9 +1402,9 @@ var gBrowserInit = {
// Enable developer toolbar? // Enable developer toolbar?
let devToolbarEnabled = gPrefService.getBoolPref("devtools.toolbar.enabled"); let devToolbarEnabled = gPrefService.getBoolPref("devtools.toolbar.enabled");
if (devToolbarEnabled) { if (devToolbarEnabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_DevToolbar"); let cmd = document.getElementById("Tools:DevToolbar");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
document.getElementById("Tools:DevToolbarFocus").removeAttribute("disabled"); document.getElementById("Tools:DevToolbarFocus").removeAttribute("disabled");
// Show the toolbar if it was previously visible // Show the toolbar if it was previously visible
@@ -1416,25 +1416,25 @@ var gBrowserInit = {
// Enable Inspector? // Enable Inspector?
let enabled = gPrefService.getBoolPref("devtools.inspector.enabled"); let enabled = gPrefService.getBoolPref("devtools.inspector.enabled");
if (enabled) { if (enabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Inspect"); let cmd = document.getElementById("Tools:Inspect");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
// Enable Debugger? // Enable Debugger?
let enabled = gPrefService.getBoolPref("devtools.debugger.enabled"); let enabled = gPrefService.getBoolPref("devtools.debugger.enabled");
if (enabled) { if (enabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Debugger"); let cmd = document.getElementById("Tools:Debugger");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
// Enable Remote Debugger? // Enable Remote Debugger?
let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled"); let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled");
if (enabled) { if (enabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_RemoteDebugger"); let cmd = document.getElementById("Tools:RemoteDebugger");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
// Enable Chrome Debugger? // Enable Chrome Debugger?
@@ -1442,34 +1442,34 @@ var gBrowserInit = {
gPrefService.getBoolPref("devtools.debugger.chrome-enabled") && gPrefService.getBoolPref("devtools.debugger.chrome-enabled") &&
gPrefService.getBoolPref("devtools.debugger.remote-enabled"); gPrefService.getBoolPref("devtools.debugger.remote-enabled");
if (enabled) { if (enabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ChromeDebugger"); let cmd = document.getElementById("Tools:ChromeDebugger");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
// Enable Error Console? // Enable Error Console?
// XXX Temporarily always-enabled, see bug 601201 // XXX Temporarily always-enabled, see bug 601201
let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled"); let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled");
if (consoleEnabled) { if (consoleEnabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ErrorConsole"); let cmd = document.getElementById("Tools:ErrorConsole");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
// Enable Scratchpad in the UI, if the preference allows this. // Enable Scratchpad in the UI, if the preference allows this.
let scratchpadEnabled = gPrefService.getBoolPref(Scratchpad.prefEnabledName); let scratchpadEnabled = gPrefService.getBoolPref(Scratchpad.prefEnabledName);
if (scratchpadEnabled) { if (scratchpadEnabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Scratchpad"); let cmd = document.getElementById("Tools:Scratchpad");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
// Enable Style Editor? // Enable Style Editor?
let styleEditorEnabled = gPrefService.getBoolPref(StyleEditor.prefEnabledName); let styleEditorEnabled = gPrefService.getBoolPref(StyleEditor.prefEnabledName);
if (styleEditorEnabled) { if (styleEditorEnabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_StyleEditor"); let cmd = document.getElementById("Tools:StyleEditor");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
#ifdef MENUBAR_CAN_AUTOHIDE #ifdef MENUBAR_CAN_AUTOHIDE
@@ -1484,9 +1484,9 @@ var gBrowserInit = {
// Enable Responsive UI? // Enable Responsive UI?
let responsiveUIEnabled = gPrefService.getBoolPref("devtools.responsiveUI.enabled"); let responsiveUIEnabled = gPrefService.getBoolPref("devtools.responsiveUI.enabled");
if (responsiveUIEnabled) { if (responsiveUIEnabled) {
let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ResponsiveUI"); let cmd = document.getElementById("Tools:ResponsiveUI");
broadcaster.removeAttribute("disabled"); cmd.removeAttribute("disabled");
broadcaster.removeAttribute("hidden"); cmd.removeAttribute("hidden");
} }
let appMenuButton = document.getElementById("appmenu-button"); let appMenuButton = document.getElementById("appmenu-button");