Title: [164885] trunk/Source/WebInspectorUI
Revision
164885
Author
[email protected]
Date
2014-02-28 14:54:18 -0800 (Fri, 28 Feb 2014)

Log Message

Enable breakpoints when adding a new breakpoint or enabling an existing breakpoint.

This eliminates a multi-step process for the user that can be confusing.

https://bugs.webkit.org/show_bug.cgi?id=129426

Reviewed by Joseph Pecoraro.

* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype.set breakpointsEnabled):
(WebInspector.DebuggerManager.prototype._breakpointDisabledStateDidChange):
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel):
(WebInspector.DebuggerSidebarPanel.prototype._breakpointsEnabledDidChange):
(WebInspector.DebuggerSidebarPanel.prototype._breakpointsToggleButtonClicked):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (164884 => 164885)


--- trunk/Source/WebInspectorUI/ChangeLog	2014-02-28 22:51:45 UTC (rev 164884)
+++ trunk/Source/WebInspectorUI/ChangeLog	2014-02-28 22:54:18 UTC (rev 164885)
@@ -1,3 +1,21 @@
+2014-02-28  Timothy Hatcher  <[email protected]>
+
+        Enable breakpoints when adding a new breakpoint or enabling an existing breakpoint.
+
+        This eliminates a multi-step process for the user that can be confusing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=129426
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Controllers/DebuggerManager.js:
+        (WebInspector.DebuggerManager.prototype.set breakpointsEnabled):
+        (WebInspector.DebuggerManager.prototype._breakpointDisabledStateDidChange):
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WebInspector.DebuggerSidebarPanel):
+        (WebInspector.DebuggerSidebarPanel.prototype._breakpointsEnabledDidChange):
+        (WebInspector.DebuggerSidebarPanel.prototype._breakpointsToggleButtonClicked):
+
 2014-02-27  Timothy Hatcher  <[email protected]>
 
         Use a RegExp when when using CodeMirror's SearchCursor.

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (164884 => 164885)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js	2014-02-28 22:51:45 UTC (rev 164884)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js	2014-02-28 22:54:18 UTC (rev 164885)
@@ -85,7 +85,8 @@
     CallFramesDidChange: "debugger-manager-call-frames-did-change",
     ActiveCallFrameDidChange: "debugger-manager-active-call-frame-did-change",
     ScriptAdded: "debugger-manager-script-added",
-    ScriptsCleared: "debugger-manager-scripts-cleared"
+    ScriptsCleared: "debugger-manager-scripts-cleared",
+    BreakpointsEnabledDidChange: "debugger-manager-breakpoints-enabled-did-change"
 };
 
 WebInspector.DebuggerManager.prototype = {
@@ -105,6 +106,8 @@
 
         this._breakpointsEnabledSetting.value = enabled;
 
+        this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange);
+
         this._allExceptionsBreakpoint.dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
         this._allUncaughtExceptionsBreakpoint.dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
 
@@ -517,6 +520,10 @@
         if (breakpoint.identifier || breakpoint.disabled)
             return;
 
+        // Enable breakpoints since a breakpoint is being set. This eliminates
+        // a multi-step process for the user that can be confusing.
+        this.breakpointsEnabled = true;
+
         function didSetBreakpoint(error, breakpointIdentifier)
         {
             if (error)
@@ -616,12 +623,16 @@
         var breakpoint = event.target;
 
         if (breakpoint === this._allExceptionsBreakpoint) {
+            if (!breakpoint.disabled)
+                this.breakpointsEnabled = true;
             this._allExceptionsBreakpointEnabledSetting.value = !breakpoint.disabled;
             this._updateBreakOnExceptionsState();
             return;
         }
 
         if (breakpoint === this._allUncaughtExceptionsBreakpoint) {
+            if (!breakpoint.disabled)
+                this.breakpointsEnabled = true;
             this._allUncaughtExceptionsBreakpointEnabledSetting.value = !breakpoint.disabled;
             this._updateBreakOnExceptionsState();
             return;

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (164884 => 164885)


--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js	2014-02-28 22:51:45 UTC (rev 164884)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js	2014-02-28 22:54:18 UTC (rev 164885)
@@ -30,6 +30,7 @@
     WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
     WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceAdded, this);
 
+    WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange, this._breakpointsEnabledDidChange, this);
     WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, this._debuggerCallFramesDidChange, this);
     WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointAdded, this._breakpointAdded, this);
     WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointRemoved, this._breakpointRemoved, this);
@@ -219,10 +220,14 @@
         this._debuggerStepOutButtonItem.enabled = false;
     },
 
+    _breakpointsEnabledDidChange: function(event)
+    {
+        this._debuggerBreakpointsButtonItem.activated = WebInspector.debuggerManager.breakpointsEnabled;
+    },
+
     _breakpointsToggleButtonClicked: function(event)
     {
-        this._debuggerBreakpointsButtonItem.activated = !this._debuggerBreakpointsButtonItem.activated;
-        WebInspector.debuggerManager.breakpointsEnabled = this._debuggerBreakpointsButtonItem.activated;
+        WebInspector.debuggerManager.breakpointsEnabled = !this._debuggerBreakpointsButtonItem.activated;
     },
 
     _addBreakpoint: function(breakpoint, sourceCode)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to