Changeset 90635 in webkit

Timestamp:

Jul 8, 2011 8:53:56 AM (13 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: NetworkPanel search failed if the matched sting is in the query part of url
​https://bugs.webkit.org/show_bug.cgi?id=64167

Reviewed by Yury Semikhatsky.

• inspector/front-end/NetworkPanel.js:

(WebInspector.NetworkPanel.prototype._matchResource):
(WebInspector.NetworkPanel.prototype._highlightNthMatchedResource):
(WebInspector.NetworkDataGridNode.prototype._refreshNameCell):

• inspector/front-end/Resource.js:

(WebInspector.Resource.prototype.get folder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/NetworkPanel.js (modified) (3 diffs)
• inspector/front-end/Resource.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: NetworkPanel search failed if the matched sting is in the query part of url
+        https://bugs.webkit.org/show_bug.cgi?id=64167
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype._matchResource):
+        (WebInspector.NetworkPanel.prototype._highlightNthMatchedResource):
+        (WebInspector.NetworkDataGridNode.prototype._refreshNameCell):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.get folder):
+
 2011-07-08  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/inspector/front-end/NetworkPanel.js

@@ -1118 +1118 @@
             return -1;
 
-        if ((!resource.displayName || !resource.displayName.match(this._searchRegExp)) && (!resource.path || !resource.path.match(this._searchRegExp)))
+        if ((!resource.displayName || !resource.displayName.match(this._searchRegExp)) && !resource.folder.match(this._searchRegExp))
             return -1;
 
@@ -1169 +1169 @@
 
         var nameMatched = resource.displayName && resource.displayName.match(this._searchRegExp);
-        var pathMatched = resource.path && resource.path.match(this._searchRegExp);
+        var pathMatched = resource.path && resource.folder.match(this._searchRegExp);
         if (!nameMatched && pathMatched && !this._largerResourcesButton.toggled)
             this._toggleLargerResources();
@@ -1659 +1659 @@
         var subtitle = this._resource.displayDomain;
 
-        if (this._resource.path && this._resource.lastPathComponent) {
-            var lastPathComponentIndex = this._resource.path.lastIndexOf("/" + this._resource.lastPathComponent);
-            if (lastPathComponentIndex != -1)
-                subtitle += this._resource.path.substring(0, lastPathComponentIndex);
-        }
+        if (this._resource.path)
+            subtitle += this._resource.folder;
 
         this._appendSubtitle(this._nameCell, subtitle);

trunk/Source/WebCore/inspector/front-end/Resource.js

@@ -248 +248 @@
     },
 
+    get folder()
+    {
+        var path = this.path;
+        var indexOfQuery = path.indexOf("?");
+        if (indexOfQuery !== -1)
+            path = path.substring(0, indexOfQuery);
+        var lastSlashIndex = path.lastIndexOf("/");
+        return lastSlashIndex !== -1 ? path.substring(0, lastSlashIndex) : "";
+    },
+
     get displayDomain()
     {