From 3962a7b2c1f9d394d3ba95ac7c53888028d5278f Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Thu, 24 Jan 2019 15:37:36 -0500 Subject: [PATCH] Bug 1522138 - [release 120] Update debugger frontend. r=dwalsh --- devtools/client/debugger/new/README.mozilla | 4 ++-- .../src/components/SecondaryPanes/Breakpoints/Breakpoint.js | 2 +- devtools/client/debugger/new/src/utils/prefs.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/new/README.mozilla index 69edfe722af5..b366ba930eb6 100644 --- a/devtools/client/debugger/new/README.mozilla +++ b/devtools/client/debugger/new/README.mozilla @@ -1,9 +1,9 @@ This is the debugger.html project output. See https://github.com/devtools-html/debugger.html -Version 117 +Version 120 -Comparison: https://github.com/devtools-html/debugger.html/compare/release-116...release-117 +Comparison: https://github.com/devtools-html/debugger.html/compare/release-119...release-120 Packages: - babel-plugin-transform-es2015-modules-commonjs @6.26.2 diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js index 6e72148a0621..12beb8e46964 100644 --- a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js +++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js @@ -135,7 +135,7 @@ class Breakpoint extends PureComponent { editor.CodeMirror.runMode(text, "application/javascript", node); return { __html: node.innerHTML }; }, - (text, editor) => `${text} - ${editor ? "editor" : ""}` + (text, editor) => `${text} - ${editor.CodeMirror ? "editor" : ""}` ); /* eslint-disable react/no-danger */ diff --git a/devtools/client/debugger/new/src/utils/prefs.js b/devtools/client/debugger/new/src/utils/prefs.js index 450d2130a31c..e7aa8b02c3ac 100644 --- a/devtools/client/debugger/new/src/utils/prefs.js +++ b/devtools/client/debugger/new/src/utils/prefs.js @@ -69,7 +69,7 @@ if (isDevelopment()) { } export const prefs = new PrefsHelper("devtools", { - logging: ["Bool", "debugger.alphabetize-outline"], + logging: ["Bool", "debugger.logging"], alphabetizeOutline: ["Bool", "debugger.alphabetize-outline"], autoPrettyPrint: ["Bool", "debugger.auto-pretty-print"], clientSourceMapsEnabled: ["Bool", "source-map.client-service.enabled"],