Title: [190448] trunk/Source/WebInspectorUI
- Revision
- 190448
- Author
- commit-qu...@webkit.org
- Date
- 2015-10-01 18:53:45 -0700 (Thu, 01 Oct 2015)
Log Message
Web Inspector: Simplify filterableData processing
https://bugs.webkit.org/show_bug.cgi?id=149730
Patch by Joseph Pecoraro <pecor...@apple.com> on 2015-10-01
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):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (190447 => 190448)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-10-02 01:29:52 UTC (rev 190447)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-10-02 01:53:45 UTC (rev 190448)
@@ -1,5 +1,24 @@
2015-10-01 Joseph Pecoraro <pecor...@apple.com>
+ 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-10-01 Joseph Pecoraro <pecor...@apple.com>
+
Web Inspector: Do not immediately create all ProfileNodeTreeElements when showing _javascript_ and Events timeline
https://bugs.webkit.org/show_bug.cgi?id=149726
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (190447 => 190448)
--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2015-10-02 01:29:52 UTC (rev 190447)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2015-10-02 01:53:45 UTC (rev 190448)
@@ -73,7 +73,7 @@
get filterableData()
{
- return {text: this.breakpoint.url};
+ return {text: [this.breakpoint.url]};
}
ondelete()
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (190447 => 190448)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-10-02 01:29:52 UTC (rev 190447)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-10-02 01:53:45 UTC (rev 190448)
@@ -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: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (190447 => 190448)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-10-02 01:29:52 UTC (rev 190447)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-10-02 01:53:45 UTC (rev 190448)
@@ -83,7 +83,7 @@
get filterableData()
{
- return {text: this._resource.url};
+ return {text: [this._resource.url]};
}
ondblclick()
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (190447 => 190448)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-10-02 01:29:52 UTC (rev 190447)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-10-02 01:53:45 UTC (rev 190448)
@@ -152,11 +152,6 @@
return pathComponents;
}
- matchTreeElementAgainstCustomFilters(treeElement)
- {
- return this._dataGrid.treeElementMatchesActiveScopeFilters(treeElement);
- }
-
reset()
{
super.reset();
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js (190447 => 190448)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js 2015-10-02 01:29:52 UTC (rev 190447)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js 2015-10-02 01:53:45 UTC (rev 190448)
@@ -80,7 +80,7 @@
get filterableData()
{
- return {text: this.representedObject.title};
+ return {text: [this.representedObject.title]};
}
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
