Changeset 193771 in webkit

Timestamp:

Dec 8, 2015, 12:42:42 PM (10 years ago)

Author:

Matt Baker

Message:

Web Inspector: Global Breakpoints should always be visible
​https://bugs.webkit.org/show_bug.cgi?id=151066

Reviewed by Timothy Hatcher.

• UserInterface/Views/DebuggerSidebarPanel.js:

(WebInspector.DebuggerSidebarPanel):
Turn off filtering for Global Breakpoints elements.

• UserInterface/Views/NavigationSidebarPanel.js:

(WebInspector.NavigationSidebarPanel.prototype.suppressFilteringOnTreeElements):
Allow filtering to be turned off for specific tree elements.
(WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement):
Make element visible if filtering suppressed.
(WebInspector.NavigationSidebarPanel.prototype._checkForEmptyFilterResults):
Visible elements with filtering disabled aren't considered when
showing/hiding the empty content placeholder.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/NavigationSidebarPanel.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-12-08  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: Global Breakpoints should always be visible
+        https://bugs.webkit.org/show_bug.cgi?id=151066
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WebInspector.DebuggerSidebarPanel):
+        Turn off filtering for Global Breakpoints elements.
+
+        * UserInterface/Views/NavigationSidebarPanel.js:
+        (WebInspector.NavigationSidebarPanel.prototype.suppressFilteringOnTreeElements):
+        Allow filtering to be turned off for specific tree elements.
+        (WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement):
+        Make element visible if filtering suppressed.
+        (WebInspector.NavigationSidebarPanel.prototype._checkForEmptyFilterResults):
+        Visible elements with filtering disabled aren't considered when
+        showing/hiding the empty content placeholder.
+
 2015-12-07  Brian Burg  <bburg@apple.com>
 

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

@@ -123 +123 @@
         this._globalBreakpointsFolderTreeElement.expand();
 
+        this.suppressFilteringOnTreeElements([this._globalBreakpointsFolderTreeElement, this._allExceptionsBreakpointTreeElement, this._allUncaughtExceptionsBreakpointTreeElement]);
+
         var breakpointsRow = new WebInspector.DetailsSectionRow;
         breakpointsRow.element.appendChild(this._breakpointsContentTreeOutline.element);

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

@@ -178 +178 @@
     }
 
+    suppressFilteringOnTreeElements(treeElements)
+    {
+        console.assert(Array.isArray(treeElements), "TreeElements should be an array.");
+
+        for (let treeElement of treeElements)
+            treeElement[WebInspector.NavigationSidebarPanel.SuppressFilteringSymbol] = true;
+
+        this._updateFilter();
+    }
+
     treeElementForRepresentedObject(representedObject)
     {
@@ -386 +396 @@
         }
 
-        if (matchTextFilter(filterableData.text) && this.matchTreeElementAgainstFilterFunctions(treeElement, flags) && this.matchTreeElementAgainstCustomFilters(treeElement, flags)) {
+        let suppressFiltering = treeElement[WebInspector.NavigationSidebarPanel.SuppressFilteringSymbol];
+
+        if (suppressFiltering || (matchTextFilter(filterableData.text) && this.matchTreeElementAgainstFilterFunctions(treeElement, flags) && this.matchTreeElementAgainstCustomFilters(treeElement, flags))) {
             // Make this element visible since it matches.
             makeVisible();
@@ -499 +511 @@
         var currentTreeElement = this._contentTreeOutline.children[0];
         while (currentTreeElement) {
-            if (!currentTreeElement.hidden) {
+            if (!currentTreeElement.hidden && !currentTreeElement[WebInspector.NavigationSidebarPanel.SuppressFilteringSymbol]) {
                 // Not hidden, so hide any empty content message.
                 this.hideEmptyContentPlaceholder();
@@ -718 +730 @@
 };
 
+WebInspector.NavigationSidebarPanel.SuppressFilteringSymbol = Symbol("supresss-filtering");
 WebInspector.NavigationSidebarPanel.WasExpandedDuringFilteringSymbol = Symbol("was-expanded-during-filtering");