mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-05 12:05:22 +00:00
Backed out changeset 743e2ea36e51, botched commit message, a=developers
This commit is contained in:
parent
33dc57e93c
commit
65872005a0
@ -395,9 +395,11 @@ pref("browser.bookmarks.max_backups", 10);
|
|||||||
|
|
||||||
// Scripts & Windows prefs
|
// Scripts & Windows prefs
|
||||||
pref("dom.disable_open_during_load", true);
|
pref("dom.disable_open_during_load", true);
|
||||||
pref("javascript.options.showInConsole", true);
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
pref("javascript.options.showInConsole", true);
|
||||||
pref("general.warnOnAboutConfig", false);
|
pref("general.warnOnAboutConfig", false);
|
||||||
|
#else
|
||||||
|
pref("javascript.options.showInConsole", false);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WINCE
|
#ifdef WINCE
|
||||||
@ -1029,8 +1031,5 @@ pref("services.sync.prefs.sync.spellchecker.dictionary", true);
|
|||||||
pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
|
pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Disable the Error Console
|
|
||||||
pref("devtools.errorconsole.enabled", false);
|
|
||||||
|
|
||||||
// disable the Inspector
|
// disable the Inspector
|
||||||
pref("devtools.inspector.enabled", false);
|
pref("devtools.inspector.enabled", false);
|
||||||
|
@ -541,7 +541,6 @@
|
|||||||
key="key_inspect"
|
key="key_inspect"
|
||||||
command="Tools:Inspect"/>
|
command="Tools:Inspect"/>
|
||||||
<menuitem id="javascriptConsole"
|
<menuitem id="javascriptConsole"
|
||||||
hidden="true"
|
|
||||||
label="&errorConsoleCmd.label;"
|
label="&errorConsoleCmd.label;"
|
||||||
accesskey="&errorConsoleCmd.accesskey;"
|
accesskey="&errorConsoleCmd.accesskey;"
|
||||||
key="key_errorConsole"
|
key="key_errorConsole"
|
||||||
|
@ -236,7 +236,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;" oncommand="toJavaScriptConsole();" modifiers="accel,shift"/>
|
||||||
<key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" modifiers="accel,shift"/>
|
<key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" modifiers="accel,shift"/>
|
||||||
<key id="key_inspect" key="&inspectMenu.commandkey;" command="Tools:Inspect" modifiers="accel,shift"/>
|
<key id="key_inspect" key="&inspectMenu.commandkey;" command="Tools:Inspect" modifiers="accel,shift"/>
|
||||||
<key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile" modifiers="accel"/>
|
<key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile" modifiers="accel"/>
|
||||||
|
@ -1523,13 +1523,6 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
|
|||||||
appMenuInspect.setAttribute("hidden", false);
|
appMenuInspect.setAttribute("hidden", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enable Error Console?
|
|
||||||
let consoleEnabled = gPrefService.getBoolPref("devtools.errorconsole.enabled");
|
|
||||||
if (consoleEnabled) {
|
|
||||||
document.getElementById("javascriptConsole").hidden = false;
|
|
||||||
document.getElementById("key_errorConsole").disabled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Services.obs.notifyObservers(window, "browser-delayed-startup-finished", "");
|
Services.obs.notifyObservers(window, "browser-delayed-startup-finished", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user