Changeset 225939 in webkit

Timestamp:

Dec 14, 2017, 3:54:21 PM (9 years ago)

Author:

commit-queue@webkit.org

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 <Joseph Pecoraro> 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.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (7 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-12-14  Joseph Pecoraro  <pecoraro@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  <pecoraro@apple.com>
 

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

@@ -84 +84 @@
 
         this._urlFilterSearchText = null;
+        this._urlFilterSearchRegex = null;
         this._urlFilterIsActive = false;
 
@@ -905 +906 @@
     }
 
-    _checkURLFilterAgainstFinishedResource(resource)
-    {
-        let searchQuery = this._urlFilterSearchText;
-        if (resource.url.includes(searchQuery))
+    _checkURLFilterAgainstResource(resource)
+    {
+        if (this._urlFilterSearchRegex.test(resource.url))
             this._activeURLFilterResources.add(resource);
     }
@@ -1078 +1078 @@
 
         if (this._hasURLFilter())
-            this._checkURLFilterAgainstFinishedResource(resource);
+            this._checkURLFilterAgainstResource(resource);
 
         this.needsLayout();
@@ -1094 +1094 @@
 
         if (this._hasURLFilter())
-            this._checkURLFilterAgainstFinishedResource(resource);
+            this._checkURLFilterAgainstResource(resource);
 
         this.needsLayout();
@@ -1275 +1275 @@
         // Clear url filter.
         this._urlFilterSearchText = null;
+        this._urlFilterSearchRegex = null;
         this._urlFilterIsActive = false;
         this._activeURLFilterResources.clear();
@@ -1336 +1337 @@
         if (!searchQuery) {
             this._urlFilterSearchText = null;
+            this._urlFilterSearchRegex = null;
             this._urlFilterIsActive = false;
             this._activeURLFilterResources.clear();
@@ -1346 +1348 @@
         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();