Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 02:47:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1605330 - [devtools] Enable context selector on Nightly. r=ochameau.

Browse Source 
We take this opportunity to merge the browser toolbox and content toolbox preferences
into a single one.

Depends on D131600

Differential Revision: https://phabricator.services.mozilla.com/D131770
This commit is contained in:
Nicolas Chevobbe 2021-11-23 18:56:55 +00:00
parent 8439507fa4
commit 59b28c6aa5
10 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/app/profile/firefox.js
View File

@ -2464,16 +2464,13 @@ pref("devtools.webconsole.filter.netxhr", false);
// Webconsole autocomplete preference
pref("devtools.webconsole.input.autocomplete",true);
// Show context selector in console input, in the browser toolbox
// Show context selector in console input
#if defined(NIGHTLY_BUILD)
pref("devtools.webconsole.input.context", true);
#else
pref("devtools.webconsole.input.context", false);
#endif
// Show context selector in console input, in the content toolbox
pref("devtools.contenttoolbox.webconsole.input.context", false);
// Set to true to eagerly show the results of webconsole terminal evaluations
// when they don't have side effects.
pref("devtools.webconsole.input.eagerEvaluation", true);

7
devtools/client/webconsole/constants.js
View File

@ -84,11 +84,8 @@ const prefs = {
EDITOR_WIDTH: "input.editorWidth",
// Show the Editor onboarding UI
EDITOR_ONBOARDING: "devtools.webconsole.input.editorOnboarding",
// Show the Input Context the selector in the browser toolbox
CONTEXT_SELECTOR_BROWSER_TOOLBOX: "devtools.webconsole.input.context",
// Show the Input Context the selector in the content toolbox
CONTEXT_SELECTOR_CONTENT_TOOLBOX:
"devtools.contenttoolbox.webconsole.input.context",
// Show the Input Context the selector
CONTEXT_SELECTOR: "devtools.webconsole.input.context",
},
FEATURES: {
// We use the same pref to enable the sidebar on webconsole and browser console.

6
devtools/client/webconsole/store.js
View File

@ -81,11 +81,7 @@ function configureStore(webConsoleUI, options = {}) {
editorWidth: getIntPref(PREFS.UI.EDITOR_WIDTH),
showEditorOnboarding: getBoolPref(PREFS.UI.EDITOR_ONBOARDING),
timestampsVisible: getBoolPref(PREFS.UI.MESSAGE_TIMESTAMP),
showEvaluationContextSelector: getBoolPref(
webConsoleUI.isBrowserToolboxConsole
? PREFS.UI.CONTEXT_SELECTOR_BROWSER_TOOLBOX
: PREFS.UI.CONTEXT_SELECTOR_CONTENT_TOOLBOX
),
showEvaluationContextSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
}),
};

2
devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector.js
View File

@ -11,7 +11,7 @@ const IFRAME_PATH = `${FILE_FOLDER}/test-console-evaluation-context-selector-chi
requestLongerTimeout(2);
add_task(async function() {
await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
await pushPref("devtools.webconsole.input.context", true);
const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
`https://example.org/${IFRAME_PATH}?id=iframe-1`,

2
devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_iframe_picker.js
View File

@ -17,7 +17,7 @@ const TEST_URI = `https://example.com/document-builder.sjs?html=${encodeURICompo
add_task(async function() {
// Enable the context selector and the frames button.
await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
await pushPref("devtools.webconsole.input.context", true);
await pushPref("devtools.command-button-frames.enabled", true);
const hud = await openNewTabAndConsole(TEST_URI);

2
devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_inspector.js
View File

@ -20,7 +20,7 @@ Services.scriptloader.loadSubScript(
requestLongerTimeout(2);
add_task(async function() {
await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
await pushPref("devtools.webconsole.input.context", true);
const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
`https://example.org/${IFRAME_PATH}?id=iframe-1`,

2
devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_pause_in_debugger.js
View File

@ -12,7 +12,7 @@ const TEST_URI = `${URL_ROOT_COM_SSL}test-console-evaluation-context-selector.ht
const IFRAME_FILE = `test-console-evaluation-context-selector-child.html`;
add_task(async function() {
await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
await pushPref("devtools.webconsole.input.context", true);
const tab = await addTab(TEST_URI);

2
devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_targets_update.js
View File

@ -12,7 +12,7 @@ const IFRAME_PATH = `${FILE_FOLDER}/test-console-evaluation-context-selector-chi
// the context is set to the top one if the destroyed target was selected).
add_task(async function() {
await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
await pushPref("devtools.webconsole.input.context", true);
const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
`https://example.net/${IFRAME_PATH}?id=iframe-1`,

2
devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js
View File

@ -18,7 +18,7 @@ const { FileUtils } = ChromeUtils.import(
const dpr = "--dpr 1";
add_task(async function() {
await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
await pushPref("devtools.webconsole.input.context", true);
const hud = await openNewTabAndConsole(TEST_URI);

1
devtools/client/webconsole/test/node/mocha-test-setup.js
View File

@ -38,7 +38,6 @@ pref("devtools.browserconsole.contentMessages", true);
pref("devtools.webconsole.input.editorWidth", 800);
pref("devtools.webconsole.input.editorOnboarding", true);
pref("devtools.webconsole.input.context", false);
pref("devtools.contenttoolbox.webconsole.input.context", false);
global.loader = {
lazyServiceGetter: () => {},