diff --git a/.eslintignore b/.eslintignore index 1d5d40d264d3..ae97d88107d4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -138,9 +138,8 @@ devtools/shared/qrcode/tests/mochitest/test_decode.html devtools/shared/tests/mochitest/*.html devtools/shared/webconsole/test/test_*.html -# Ignore devtools preferences files +# Ignore devtools pre-processed files devtools/client/preferences/** -devtools/shim/devtools-startup-prefs.js # Ignore devtools third-party libs devtools/shared/jsbeautify/* diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index e7206bf67fd1..aa4a636f77fc 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -630,7 +630,6 @@ ; [DevTools Shim Files] @RESPATH@/browser/chrome/devtools-shim@JAREXT@ @RESPATH@/browser/chrome/devtools-shim.manifest -@RESPATH@/browser/@PREF_DIR@/devtools-startup-prefs.js ; shell icons #ifdef XP_UNIX diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js index c34897537178..f9faf7c1aa3b 100644 --- a/devtools/client/preferences/devtools.js +++ b/devtools/client/preferences/devtools.js @@ -353,5 +353,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). +pref("devtools.jsonview.enabled", true); + // Enable the HTML responsive design mode for all channels. pref("devtools.responsive.html.enabled", true); diff --git a/devtools/shim/devtools-startup-prefs.js b/devtools/shim/devtools-startup-prefs.js deleted file mode 100644 index 6e6610681188..000000000000 --- a/devtools/shim/devtools-startup-prefs.js +++ /dev/null @@ -1,12 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// This Devtools preferences file will be loaded as a usual Firefox preferences file. -// Most DevTools prefs are included with the addon and loaded dynamically during the addon -// startup. For preferences that are required before the addon is loaded or that we can't -// process in JS, they can be defined in this file. -// Note that this preference file follows Firefox release cycle. - -// Enable the JSON View tool (an inspector for application/json documents). -pref("devtools.jsonview.enabled", true); diff --git a/devtools/shim/moz.build b/devtools/shim/moz.build index 142c93303f71..4c73beef419b 100644 --- a/devtools/shim/moz.build +++ b/devtools/shim/moz.build @@ -6,10 +6,6 @@ JAR_MANIFESTS += ['jar.mn'] -JS_PREFERENCE_FILES += [ - 'devtools-startup-prefs.js', -] - # Register the about:debugging page only for 'addon' and 'all' builds. if CONFIG['MOZ_DEVTOOLS'] != 'server': EXTRA_COMPONENTS += [