[webkit-changes] [225939] trunk/Source/WebInspectorUI

[commit-queue]

Title: [225939] trunk/Source/WebInspectorUI

Revision

225939

Author

commit-qu...@webkit.org

Date

2017-12-14 15:54:21 -0800 (Thu, 14 Dec 2017)

Log Message

Web Inspector: Network Tab - URL filter should be case-insensitive like filter bars in other tabs
https://bugs.webkit.org/show_bug.cgi?id=180824
<rdar://problem/35910750>

Patch by Joseph Pecoraro <pecor...@apple.com> on 2017-12-14
Reviewed by Brian Burg.

* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView):
(WI.NetworkTableContentView.prototype._resetFilters):
(WI.NetworkTableContentView.prototype._urlFilterDidChange):
Use a case-insensitive regex created from the search query
and use that when filtering resources.

(WI.NetworkTableContentView.prototype._checkURLFilterAgainstFinishedResource): Deleted.
(WI.NetworkTableContentView.prototype._checkURLFilterAgainstResource):
(WI.NetworkTableContentView.prototype._resourceLoadingDidFinish):
(WI.NetworkTableContentView.prototype._resourceLoadingDidFail):
Rename the helper for checking the URL filter.

Modified Paths

• trunk/Source/WebInspectorUI/ChangeLog
• trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (225938 => 225939)

--- trunk/Source/WebInspectorUI/ChangeLog	2017-12-14 23:51:05 UTC (rev 225938)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-12-14 23:54:21 UTC (rev 225939)
@@ -1,5 +1,26 @@
 2017-12-14  Joseph Pecoraro  <pecor...@apple.com>
 
+        Web Inspector: Network Tab - URL filter should be case-insensitive like filter bars in other tabs
+        https://bugs.webkit.org/show_bug.cgi?id=180824
+        <rdar://problem/35910750>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView):
+        (WI.NetworkTableContentView.prototype._resetFilters):
+        (WI.NetworkTableContentView.prototype._urlFilterDidChange):
+        Use a case-insensitive regex created from the search query
+        and use that when filtering resources.
+
+        (WI.NetworkTableContentView.prototype._checkURLFilterAgainstFinishedResource): Deleted.
+        (WI.NetworkTableContentView.prototype._checkURLFilterAgainstResource):
+        (WI.NetworkTableContentView.prototype._resourceLoadingDidFinish):
+        (WI.NetworkTableContentView.prototype._resourceLoadingDidFail):
+        Rename the helper for checking the URL filter.
+
+2017-12-14  Joseph Pecoraro  <pecor...@apple.com>
+
         Web Inspector: UncaughtExceptionReporter fails on early errors
         https://bugs.webkit.org/show_bug.cgi?id=180776
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (225938 => 225939)

--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2017-12-14 23:51:05 UTC (rev 225938)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2017-12-14 23:54:21 UTC (rev 225939)
@@ -83,6 +83,7 @@
         this._typeFilterScopeBar.addEventListener(WI.ScopeBar.Event.SelectionChanged, this._typeFilterScopeBarSelectionChanged, this);
 
         this._urlFilterSearchText = null;
+        this._urlFilterSearchRegex = null;
         this._urlFilterIsActive = false;
 
         this._urlFilterNavigationItem = new WI.FilterBarNavigationItem;
@@ -904,10 +905,9 @@
         this.needsLayout();
     }
 
-    _checkURLFilterAgainstFinishedResource(resource)
+    _checkURLFilterAgainstResource(resource)
     {
-        let searchQuery = this._urlFilterSearchText;
-        if (resource.url.includes(searchQuery))
+        if (this._urlFilterSearchRegex.test(resource.url))
             this._activeURLFilterResources.add(resource);
     }
 
@@ -1077,7 +1077,7 @@
             this._waterfallEndTime = resource.timingData.responseEnd;
 
         if (this._hasURLFilter())
-            this._checkURLFilterAgainstFinishedResource(resource);
+            this._checkURLFilterAgainstResource(resource);
 
         this.needsLayout();
     }
@@ -1093,7 +1093,7 @@
             this._waterfallEndTime = resource.timingData.responseEnd;
 
         if (this._hasURLFilter())
-            this._checkURLFilterAgainstFinishedResource(resource);
+            this._checkURLFilterAgainstResource(resource);
 
         this.needsLayout();
     }
@@ -1274,6 +1274,7 @@
 
         // Clear url filter.
         this._urlFilterSearchText = null;
+        this._urlFilterSearchRegex = null;
         this._urlFilterIsActive = false;
         this._activeURLFilterResources.clear();
         this._urlFilterNavigationItem.filterBar.clear();
@@ -1335,6 +1336,7 @@
         // Search cleared.
         if (!searchQuery) {
             this._urlFilterSearchText = null;
+            this._urlFilterSearchRegex = null;
             this._urlFilterIsActive = false;
             this._activeURLFilterResources.clear();
 
@@ -1345,13 +1347,12 @@
 
         this._urlFilterIsActive = true;
         this._urlFilterSearchText = searchQuery;
+        this._urlFilterSearchRegex = new RegExp(searchQuery.escapeForRegExp(), "i");
+
         this._activeURLFilterResources.clear();
 
-        for (let entry of this._entries) {
-            let resource = entry.resource;
-            if (resource.url.includes(searchQuery))
-                this._activeURLFilterResources.add(resource);
-        }
+        for (let entry of this._entries)
+            this._checkURLFilterAgainstResource(entry.resource);
 
         this._updateFilteredEntries();
         this._table.reloadData();

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes