Changeset 63741 in webkit

Timestamp:

Jul 20, 2010 5:21:02 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

2010-07-20 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Inspector: Resources Search Should Search Only Filtered Resources
​https://bugs.webkit.org/show_bug.cgi?id=28290

• inspector/front-end/AbstractTimelinePanel.js: (WebInspector.AbstractTimelinePanel.prototype._updateFilter):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.get searchableViews):
• inspector/front-end/inspector.js: (WebInspector.performSearch): (WebInspector.doPerformSearch):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/AbstractTimelinePanel.js (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-20  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Inspector: Resources Search Should Search Only Filtered Resources
+        https://bugs.webkit.org/show_bug.cgi?id=28290
+
+        * inspector/front-end/AbstractTimelinePanel.js:
+        (WebInspector.AbstractTimelinePanel.prototype._updateFilter):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.get searchableViews):
+        * inspector/front-end/inspector.js:
+        (WebInspector.performSearch):
+        (WebInspector.doPerformSearch):
+
 2010-07-20  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/inspector/front-end/AbstractTimelinePanel.js

@@ -203 +203 @@
         // in blank graph under all the resources.
         this.containerElement.scrollTop = 0;
+
+        var searchField = document.getElementById("search");
+        WebInspector.doPerformSearch(searchField.value, WebInspector.shortSearchWasForcedByKeyEvent, false, true);
     },
 

trunk/WebCore/inspector/front-end/ResourcesPanel.js

@@ -229 +229 @@
         for (var i = 0; i < resourcesLength; ++i) {
             var resource = this._resources[i];
-            if (!resource._itemsTreeElement)
+            if (!resource._itemsTreeElement || !resource._itemsTreeElement.selectable)
                 continue;
             var resourceView = this.resourceViewForResource(resource);

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

@@ -1844 +1844 @@
 WebInspector.performSearch = function(event)
 {
-    var query = event.target.value;
     var forceSearch = event.keyIdentifier === "Enter";
+    this.doPerformSearch(event.target.value, forceSearch, event.shiftKey, false);
+}
+
+WebInspector.doPerformSearch = function(query, forceSearch, isBackwardSearch, repeatSearch)
+{
     var isShortSearch = (query.length < 3);
 
@@ -1877 +1881 @@
     }
 
-    if (query === this.currentPanel.currentQuery && this.currentPanel.currentQuery === this.currentQuery) {
+    if (!repeatSearch && query === this.currentPanel.currentQuery && this.currentPanel.currentQuery === this.currentQuery) {
         // When this is the same query and a forced search, jump to the next
         // search result for a good user experience.
         if (forceSearch) {
-            var backward = event.shiftKey;
-            if (!backward && this.currentPanel.jumpToNextSearchResult)
+            if (!isBackwardSearch && this.currentPanel.jumpToNextSearchResult)
                 this.currentPanel.jumpToNextSearchResult();
-            else if (backward && this.currentPanel.jumpToPreviousSearchResult)
+            else if (isBackwardSearch && this.currentPanel.jumpToPreviousSearchResult)
                 this.currentPanel.jumpToPreviousSearchResult();
         }