[webkit-changes] [193241] branches/safari-601-branch/Source/WebInspectorUI

Thu, 03 Dec 2015 11:01:13 -0800

Title: [193241] branches/safari-601-branch/Source/WebInspectorUI

Diff

Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193240 => 193241)


--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog	2015-12-03 19:01:01 UTC (rev 193240)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog	2015-12-03 19:01:08 UTC (rev 193241)
@@ -1,5 +1,28 @@
 2015-12-02  Timothy Hatcher  <[email protected]>
 
+        Merge r190448. rdar://problem/23221163
+
+    2015-10-01  Joseph Pecoraro  <[email protected]>
+
+            Web Inspector: Simplify filterableData processing
+            https://bugs.webkit.org/show_bug.cgi?id=149730
+
+            Reviewed by Timothy Hatcher.
+
+            * UserInterface/Views/BreakpointTreeElement.js:
+            (WebInspector.BreakpointTreeElement.prototype.get filterableData):
+            * UserInterface/Views/NavigationSidebarPanel.js:
+            (WebInspector.NavigationSidebarPanel.prototype.applyFiltersToTreeElement.matchTextFilter):
+            * UserInterface/Views/ResourceTreeElement.js:
+            (WebInspector.ResourceTreeElement.prototype.get filterableData):
+            * UserInterface/Views/ScriptTimelineView.js:
+            (WebInspector.ScriptTimelineView.prototype.matchTreeElementAgainstCustomFilters): Deleted.
+            * UserInterface/Views/SearchResultTreeElement.js:
+            (WebInspector.SearchResultTreeElement.prototype.get filterableData):
+            (WebInspector.SearchResultTreeElement):
+
+2015-12-02  Timothy Hatcher  <[email protected]>
+
         Merge r190436. rdar://problem/23221163
 
     2015-10-01  Matt Baker  <[email protected]>

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (193240 => 193241)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js	2015-12-03 19:01:01 UTC (rev 193240)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js	2015-12-03 19:01:08 UTC (rev 193241)
@@ -73,7 +73,7 @@
 
     get filterableData()
     {
-        return {text: this.breakpoint.url};
+        return {text: [this.breakpoint.url]};
     }
 
     ondelete()

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (193240 => 193241)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2015-12-03 19:01:01 UTC (rev 193240)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2015-12-03 19:01:08 UTC (rev 193241)
@@ -341,22 +341,20 @@
         var filterableData = treeElement.filterableData || {};
 
         var flags = {expandTreeElement: false};
+        var filterRegex = this._textFilterRegex;
 
-        var self = this;
         function matchTextFilter(inputs)
         {
-            if (!inputs || !self._textFilterRegex)
+            if (!inputs || !filterRegex)
                 return true;
 
-            // Convert to a single item array if needed.
-            if (!(inputs instanceof Array))
-                inputs = [inputs];
+            console.assert(inputs instanceof Array, "filterableData.text should be an array of text inputs");
 
             // Loop over all the inputs and try to match them.
             for (var input of inputs) {
                 if (!input)
                     continue;
-                if (self._textFilterRegex.test(input)) {
+                if (filterRegex.test(input)) {
                     flags.expandTreeElement = true;
                     return true;
                 }

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (193240 => 193241)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js	2015-12-03 19:01:01 UTC (rev 193240)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js	2015-12-03 19:01:08 UTC (rev 193241)
@@ -83,7 +83,7 @@
 
     get filterableData()
     {
-        return {text: this._resource.url};
+        return {text: [this._resource.url]};
     }
 
     ondblclick()

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (193240 => 193241)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js	2015-12-03 19:01:01 UTC (rev 193240)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js	2015-12-03 19:01:08 UTC (rev 193241)
@@ -152,11 +152,6 @@
         return pathComponents;
     }
 
-    matchTreeElementAgainstCustomFilters(treeElement)
-    {
-        return this._dataGrid.treeElementMatchesActiveScopeFilters(treeElement);
-    }
-
     reset()
     {
         super.reset();

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js (193240 => 193241)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js	2015-12-03 19:01:01 UTC (rev 193240)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js	2015-12-03 19:01:08 UTC (rev 193241)
@@ -80,7 +80,7 @@
 
     get filterableData()
     {
-        return {text: this.representedObject.title};
+        return {text: [this.representedObject.title]};
     }
 };
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to