Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-08-17 13:34:39 +08:00
commit 18869d3807
54 changed files with 362 additions and 1459 deletions

View file

@ -330,9 +330,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
viewId: "PanelUI-developer",
shortcutId: "key_devToolboxMenuItem",
tooltiptext: "developer-button.tooltiptext2",
defaultArea: AppConstants.MOZ_DEV_EDITION ?
CustomizableUI.AREA_NAVBAR :
CustomizableUI.AREA_PANEL,
defaultArea: CustomizableUI.AREA_PANEL,
onViewShowing: function (aEvent) {
// Populate the subview with whatever menuitems are in the developer
// menu. We skip menu elements, because the menu panel has no way

View file

@ -231,11 +231,7 @@ pref("devtools.dom.enabled", false);
pref("devtools.webaudioeditor.inspectorWidth", 300);
// Default theme ("dark" or "light")
#ifdef MOZ_DEV_EDITION
sticky_pref("devtools.theme", "dark");
#else
sticky_pref("devtools.theme", "light");
#endif
// Web console filters
pref("devtools.webconsole.filter.error", true);
@ -353,13 +349,8 @@ pref("devtools.editor.autocomplete", true);
// version for each user.
pref("devtools.telemetry.tools.opened.version", "{}");
// Enable the JSON View tool (an inspector for application/json documents) on
// Nightly and Dev. Edition.
#ifdef RELEASE_OR_BETA
pref("devtools.jsonview.enabled", false);
#else
// Enable the JSON View tool (an inspector for application/json documents)
pref("devtools.jsonview.enabled", true);
#endif
// Enable the HTML responsive design mode for all channels.
pref("devtools.responsive.html.enabled", true);