Changeset 289669 in webkit

Timestamp:

Feb 11, 2022 1:46:42 PM (5 months ago)

Author:

Devin Rousso

Message:

Web Inspector: click to re-enable breakpoint clears automatic continue
​https://bugs.webkit.org/show_bug.cgi?id=236465

Reviewed by Patrick Angle.

This is not very convenient for developers as it means that they have to click more than
once when re-enabling an auto-continue breakpoint (i.e. once to enable it (which currently
disables auto-continue), and once to re-enable auto-continue). Separating these behaviors is
preferable because it's unlikely that a developer would want to disable auto-continue when
re-enabling a breakpoint if they've taken the time to previously configure auto-continue.

• UserInterface/Views/BreakpointTreeElement.js:

(WI.BreakpointTreeElement.prototype.onenter):
(WI.BreakpointTreeElement.prototype.onspace):
(WI.BreakpointTreeElement.prototype._statusImageElementClicked):

• UserInterface/Views/SourceCodeTextEditor.js:

(WI.SourceCodeTextEditor.prototype.textEditorBreakpointClicked):
Replace cycleToNextNode with disabled = !disabled.

• UserInterface/Models/Breakpoint.js:

(WI.Breakpoint.prototype.cycleToNextMode): Deleted.
Remove this method now that it's no longer used.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/Breakpoint.js (modified) (1 diff)
• UserInterface/Views/BreakpointTreeElement.js (modified) (3 diffs)
• UserInterface/Views/SourceCodeTextEditor.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2022-02-11  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: click to re-enable breakpoint clears automatic continue
+        https://bugs.webkit.org/show_bug.cgi?id=236465
+
+        Reviewed by Patrick Angle.
+
+        This is not very convenient for developers as it means that they have to click more than
+        once when re-enabling an auto-continue breakpoint (i.e. once to enable it (which currently
+        disables auto-continue), and once to re-enable auto-continue). Separating these behaviors is
+        preferable because it's unlikely that a developer would want to disable auto-continue when
+        re-enabling a breakpoint if they've taken the time to previously configure auto-continue.
+
+        * UserInterface/Views/BreakpointTreeElement.js:
+        (WI.BreakpointTreeElement.prototype.onenter):
+        (WI.BreakpointTreeElement.prototype.onspace):
+        (WI.BreakpointTreeElement.prototype._statusImageElementClicked):
+        * UserInterface/Views/SourceCodeTextEditor.js:
+        (WI.SourceCodeTextEditor.prototype.textEditorBreakpointClicked):
+        Replace `cycleToNextNode` with `disabled = !disabled`.
+
+        * UserInterface/Models/Breakpoint.js:
+        (WI.Breakpoint.prototype.cycleToNextMode): Deleted.
+        Remove this method now that it's no longer used.
+
 2022-02-11  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js

@@ -192 +192 @@
     }
 
-    cycleToNextMode()
-    {
-        if (this.disabled) {
-            if (this.editable) {
-                // When cycling, clear auto-continue when going from disabled to enabled.
-                this.autoContinue = false;
-            }
-
-            this.disabled = false;
-            return;
-        }
-
-        if (this.editable) {
-            if (this.autoContinue) {
-                this.disabled = true;
-                return;
-            }
-
-            if (this.actions.length) {
-                this.autoContinue = true;
-                return;
-            }
-        }
-
-        this.disabled = true;
-    }
-
     addAction(action, {precedingAction} = {})
     {

trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js

@@ -84 +84 @@
     onenter()
     {
-        this._breakpoint.cycleToNextMode();
+        this._breakpoint.disabled = !this._breakpoint.disabled;
         return true;
     }
@@ -90 +90 @@
     onspace()
     {
-        this._breakpoint.cycleToNextMode();
+        this._breakpoint.disabled = !this._breakpoint.disabled;
         return true;
     }
@@ -216 +216 @@
     _statusImageElementClicked(event)
     {
-        this._breakpoint.cycleToNextMode();
+        this._breakpoint.disabled = !this._breakpoint.disabled;
     }
 };

trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js

@@ -1401 +1401 @@
             return;
 
-        breakpoint.cycleToNextMode();
+        breakpoint.disabled = !breakpoint.disabled;
     }