Bug 1517349 - [release 115] [breakpoints] fix lingering log issues (#7637). r=dwalsh
authorJason Laster <jlaster@mozilla.com>
Wed, 02 Jan 2019 16:59:53 -0500
changeset 509435 398f606ed20d75b39910dfb0847eb192bbf96538
parent 509434 b2e2a91389d1908f5bba913cd91e6a7b68c3963d
child 509436 63ebbe7ce157eb7e9527df9c3263ad7968ed42f0
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdwalsh
bugs1517349
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517349 - [release 115] [breakpoints] fix lingering log issues (#7637). r=dwalsh
devtools/client/debugger/new/src/actions/breakpoints/index.js
devtools/client/debugger/new/src/selectors/breakpointSources.js
--- a/devtools/client/debugger/new/src/actions/breakpoints/index.js
+++ b/devtools/client/debugger/new/src/actions/breakpoints/index.js
@@ -192,20 +192,21 @@ export function toggleAllBreakpoints(sho
  * @memberof actions/breakpoints
  * @static
  */
 export function toggleBreakpoints(
   shouldDisableBreakpoints: boolean,
   breakpoints: Breakpoint[]
 ) {
   return async ({ dispatch }: ThunkArgs) => {
-    const promises = breakpoints.map(breakpoint =>
-      shouldDisableBreakpoints
-        ? dispatch(disableBreakpoint(breakpoint.location))
-        : dispatch(enableBreakpoint(breakpoint.location))
+    const promises = breakpoints.map(
+      breakpoint =>
+        shouldDisableBreakpoints
+          ? dispatch(disableBreakpoint(breakpoint.location))
+          : dispatch(enableBreakpoint(breakpoint.location))
     );
 
     await Promise.all(promises);
   };
 }
 
 /**
  * Removes all breakpoints
--- a/devtools/client/debugger/new/src/selectors/breakpointSources.js
+++ b/devtools/client/debugger/new/src/selectors/breakpointSources.js
@@ -25,16 +25,17 @@ import type { Selector, SourcesMap } fro
 export type BreakpointSources = Array<{
   source: Source,
   breakpoints: FormattedBreakpoint[]
 }>;
 
 export type FormattedBreakpoint = {|
   id: BreakpointId,
   condition: ?string,
+  log: boolean,
   disabled: boolean,
   text: string,
   selectedLocation: SourceLocation
 |};
 
 function formatBreakpoint(
   breakpoint: Breakpoint,
   selectedSource: ?Source