Changeset 181452 in webkit

Timestamp:

Mar 12, 2015, 1:32:29 PM (11 years ago)

Author:

jonowells@apple.com

Message:

Web Inspector: Debugger sidebar should group global breakpoints together
​https://bugs.webkit.org/show_bug.cgi?id=142607

Reviewed by Timothy Hatcher.

Update the DebuggerSidebarPanel class to hold global breakpoints such as "All Exceptions" in one container. This
will be the place future such breakpoints are added.

• Localizations/en.lproj/localizedStrings.js: Added string.
• UserInterface/Main.html: Small rearrangement.

• UserInterface/Views/DebuggerSidebarPanel.js: Change how exception breaking options are displayed.

(WebInspector.DebuggerSidebarPanel):
(WebInspector.DebuggerSidebarPanel.prototype._treeElementSelected):
(WebInspector.DebuggerSidebarPanel.prototype._compareTopLevelTreeElements):

• UserInterface/Views/FolderTreeElement.js: Support additional classes for icons.
• UserInterface/Views/ResourceSidebarPanel.js: Change call to FolderTreeElement constructor.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Main.html (modified) (2 diffs)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (6 diffs)
• UserInterface/Views/FolderTreeElement.js (modified) (2 diffs)
• UserInterface/Views/ResourceSidebarPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-12  Jono Wells  <jonowells@apple.com>
+
+        Web Inspector: Debugger sidebar should group global breakpoints together
+        https://bugs.webkit.org/show_bug.cgi?id=142607
+
+        Reviewed by Timothy Hatcher.
+
+        Update the DebuggerSidebarPanel class to hold global breakpoints such as "All Exceptions" in one container. This
+        will be the place future such breakpoints are added.
+
+        * Localizations/en.lproj/localizedStrings.js: Added string.
+        * UserInterface/Main.html: Small rearrangement.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js: Change how exception breaking options are displayed.
+        (WebInspector.DebuggerSidebarPanel):
+        (WebInspector.DebuggerSidebarPanel.prototype._treeElementSelected):
+        (WebInspector.DebuggerSidebarPanel.prototype._compareTopLevelTreeElements):
+
+        * UserInterface/Views/FolderTreeElement.js: Support additional classes for icons.
+        * UserInterface/Views/ResourceSidebarPanel.js: Change call to FolderTreeElement constructor.
+
 2015-03-12  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -234 +234 @@
 localizedStrings["Function"] = "Function";
 localizedStrings["Function Name Variable"] = "Function Name Variable";
+localizedStrings["Global Breakpoints"] = "Global Breakpoints";
 localizedStrings["Global Variables"] = "Global Variables";
 localizedStrings["Grammar"] = "Grammar";

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -319 +319 @@
     <script src="Views/DOMDetailsSidebarPanel.js"></script>
     <script src="Views/ObjectTreeBaseTreeElement.js"></script>
+    <script src="Views/FolderTreeElement.js"></script>
     <script src="Views/FolderizedTreeElement.js"></script>
     <script src="Views/SourceCodeTreeElement.js"></script>
@@ -392 +393 @@
     <script src="Views/FindBanner.js"></script>
     <script src="Views/FlexibleSpaceNavigationItem.js"></script>
-    <script src="Views/FolderTreeElement.js"></script>
     <script src="Views/FontResourceContentView.js"></script>
     <script src="Views/FormattedValue.js"></script>

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

@@ -105 +105 @@
     this.element.classList.add(WebInspector.DebuggerSidebarPanel.OffsetSectionsStyleClassName);
 
+    this._globalBreakpointsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Global Breakpoints"), null, WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName);
     this._allExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Exceptions"));
     this._allUncaughtExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Uncaught Exceptions"));
@@ -115 +116 @@
     this._breakpointsContentTreeOutline.oncontextmenu = this._breakpointTreeOutlineContextMenuTreeElement.bind(this);
 
-    this._breakpointsContentTreeOutline.appendChild(this._allExceptionsBreakpointTreeElement);
-    this._breakpointsContentTreeOutline.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
+    this._breakpointsContentTreeOutline.appendChild(this._globalBreakpointsFolderTreeElement);
+    this._globalBreakpointsFolderTreeElement.appendChild(this._allExceptionsBreakpointTreeElement);
+    this._globalBreakpointsFolderTreeElement.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
+    this._globalBreakpointsFolderTreeElement.expand();
 
     var breakpointsRow = new WebInspector.DetailsSectionRow;
@@ -148 +151 @@
 WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName = "breakpoint-exception-icon";
 WebInspector.DebuggerSidebarPanel.PausedBreakpointIconStyleClassName = "breakpoint-paused-icon";
+WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName = "global-breakpoints-icon";
 
 WebInspector.DebuggerSidebarPanel.SelectedAllExceptionsCookieKey = "debugger-sidebar-panel-all-exceptions-breakpoint";
@@ -525 +529 @@
     _breakpointTreeOutlineContextMenuTreeElement: function(event, treeElement)
     {
-        console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement);
+        console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement || treeElement.constructor === WebInspector.FolderTreeElement);
         if (!(treeElement instanceof WebInspector.ResourceTreeElement) && !(treeElement instanceof WebInspector.ScriptTreeElement))
             return;
@@ -601 +605 @@
         }
 
-        if (!(treeElement instanceof WebInspector.BreakpointTreeElement))
+        if (!(treeElement instanceof WebInspector.BreakpointTreeElement) || treeElement.parent.constructor === WebInspector.FolderTreeElement)
             return;
 
@@ -630 +634 @@
     _compareTopLevelTreeElements: function(a, b)
     {
-        if (a === this._allExceptionsBreakpointTreeElement)
+        if (a === this._globalBreakpointsFolderTreeElement)
             return -1;
-        if (b === this._allExceptionsBreakpointTreeElement)
-            return 1;
-
-        if (a === this._allUncaughtExceptionsBreakpointTreeElement)
-            return -1;
-        if (b === this._allUncaughtExceptionsBreakpointTreeElement)
+        if (b === this._globalBreakpointsFolderTreeElement)
             return 1;
 

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

@@ -24 +24 @@
  */
 
-WebInspector.FolderTreeElement = function(title, subtitle, representedObject)
+WebInspector.FolderTreeElement = function(title, subtitle, additionalClassNames, representedObject)
 {
-    WebInspector.GeneralTreeElement.call(this, WebInspector.FolderTreeElement.FolderIconStyleClassName, title, subtitle, representedObject, true);
+    var classNames;
+    if (!additionalClassNames)
+        classNames = [];
+    else if (additionalClassNames.constructor === Array)
+        classNames = additionalClassNames;
+    else if (typeof additionalClassNames === "string")
+        classNames = [additionalClassNames];
+
+    classNames.unshift(WebInspector.FolderTreeElement.FolderIconStyleClassName);
+
+    WebInspector.GeneralTreeElement.call(this, classNames, title, subtitle, representedObject, true);
 
     this.small = true;
@@ -34 +44 @@
 
 WebInspector.FolderTreeElement.prototype = {
-    constructor: WebInspector.FolderTreeElement,
+    constructor: WebInspector.FolderTreeElement
 
     // No Methods or Properties

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

@@ -911 +911 @@
             this._resourcesContentTreeOutline.removeChild(previousOnlyChild);
 
-            var folderElement = new WebInspector.FolderTreeElement(folderName, null, null);
+            var folderElement = new WebInspector.FolderTreeElement(folderName);
             this._resourcesContentTreeOutline.insertChild(folderElement, insertionIndexForObjectInListSortedByFunction(folderElement, this._resourcesContentTreeOutline.children, this._compareTreeElements));