Changeset 92849 in webkit

Timestamp:

Aug 11, 2011, 7:59:15 AM (14 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Scripts panel: display the current search match index in the toolbar.
​https://bugs.webkit.org/show_bug.cgi?id=66048

Reviewed by Pavel Feldman.

• English.lproj/localizedStrings.js:
• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype.performSearch.finishedCallback):
(WebInspector.ScriptsPanel.prototype.performSearch):
(WebInspector.ScriptsPanel.prototype.jumpToNextSearchResult):
(WebInspector.ScriptsPanel.prototype.jumpToPreviousSearchResult):

• inspector/front-end/SearchController.js:

(WebInspector.SearchController.prototype.updateSearchMatchesCount):
(WebInspector.SearchController.prototype.updateCurrentMatchIndex):
(WebInspector.SearchController.prototype.activePanelChanged.performPanelSearch):
(WebInspector.SearchController.prototype.activePanelChanged):
(WebInspector.SearchController.prototype._updateSearchMatchesCountAndCurrentMatchIndex):
(WebInspector.SearchController.prototype._performSearch):

• inspector/front-end/SourceFrame.js:

(WebInspector.SourceFrame.prototype.get currentSearchResultIndex):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) ( previous)
• inspector/front-end/ScriptsPanel.js (modified) (3 diffs)
• inspector/front-end/SearchController.js (modified) (6 diffs)
• inspector/front-end/SourceFrame.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-11  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Scripts panel: display the current search match index in the toolbar.
+        https://bugs.webkit.org/show_bug.cgi?id=66048
+
+        Reviewed by Pavel Feldman.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.performSearch.finishedCallback):
+        (WebInspector.ScriptsPanel.prototype.performSearch):
+        (WebInspector.ScriptsPanel.prototype.jumpToNextSearchResult):
+        (WebInspector.ScriptsPanel.prototype.jumpToPreviousSearchResult):
+        * inspector/front-end/SearchController.js:
+        (WebInspector.SearchController.prototype.updateSearchMatchesCount):
+        (WebInspector.SearchController.prototype.updateCurrentMatchIndex):
+        (WebInspector.SearchController.prototype.activePanelChanged.performPanelSearch):
+        (WebInspector.SearchController.prototype.activePanelChanged):
+        (WebInspector.SearchController.prototype._updateSearchMatchesCountAndCurrentMatchIndex):
+        (WebInspector.SearchController.prototype._performSearch):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype.get currentSearchResultIndex):
+
 2011-08-11  Xan Lopez  <xlopez@igalia.com>
 

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

@@ -1059 +1059 @@
             WebInspector.searchController.updateSearchMatchesCount(searchMatches, this);
             view.jumpToFirstSearchResult();
+            WebInspector.searchController.updateCurrentMatchIndex(view.currentSearchResultIndex + 1, this);
         }
 
@@ -1078 +1079 @@
         else
             this._searchView.jumpToNextSearchResult();
+        WebInspector.searchController.updateCurrentMatchIndex(this._searchView.currentSearchResultIndex + 1, this);
     },
 
@@ -1096 +1098 @@
         else
             this._searchView.jumpToPreviousSearchResult();
+        WebInspector.searchController.updateCurrentMatchIndex(this._searchView.currentSearchResultIndex + 1, this);
     },
 

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

@@ -50 +50 @@
 
         if (panel === WebInspector.currentPanel)
-            this._updateSearchMatchesCount(WebInspector.currentPanel.currentQuery && matches);
+            this._updateSearchMatchesCountAndCurrentMatchIndex(WebInspector.currentPanel.currentQuery && matches);
+    },
+
+    updateCurrentMatchIndex: function(currentMatchIndex, panel)
+    {
+        if (panel === WebInspector.currentPanel)
+            this._updateSearchMatchesCountAndCurrentMatchIndex(panel.currentSearchMatches, currentMatchIndex);
     },
 
@@ -124 +130 @@
             function performPanelSearch()
             {
-                this._updateSearchMatchesCount();
+                this._updateSearchMatchesCountAndCurrentMatchIndex();
 
                 panel.currentQuery = this._currentQuery;
@@ -134 +140 @@
         } else {
             // Update to show Not found for panels that can't be searched.
-            this._updateSearchMatchesCount();
-        }
-    },
-
-    _updateSearchMatchesCount: function(matches)
+            this._updateSearchMatchesCountAndCurrentMatchIndex();
+        }
+    },
+
+    _updateSearchMatchesCountAndCurrentMatchIndex: function(matches, currentMatchIndex)
     {
         if (matches == null) {
@@ -146 +152 @@
 
         if (matches) {
-            if (matches === 1)
-                var matchesString = WebInspector.UIString("1 match");
-            else
-                var matchesString = WebInspector.UIString("%d matches", matches);
+            if (matches === 1) {
+                if (currentMatchIndex === 1)
+                    var matchesString = WebInspector.UIString("1 of 1 match");
+                else
+                    var matchesString = WebInspector.UIString("1 match");
+            } else {
+                if (currentMatchIndex)
+                    var matchesString = WebInspector.UIString("%d of %d matches", currentMatchIndex, matches);
+                else
+                    var matchesString = WebInspector.UIString("%d matches", matches);
+            }
         } else
             var matchesString = WebInspector.UIString("Not Found");
@@ -239 +252 @@
             }
 
-            this._updateSearchMatchesCount();
+            this._updateSearchMatchesCountAndCurrentMatchIndex();
 
             return;
@@ -259 +272 @@
         this._currentQuery = query;
 
-        this._updateSearchMatchesCount();
+        this._updateSearchMatchesCountAndCurrentMatchIndex();
 
         if (!currentPanel.performSearch)

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

@@ -421 +421 @@
     },
 
+    get currentSearchResultIndex()
+    {
+        return this._currentSearchResultIndex;
+    },
+
     jumpToSearchResult: function(index)
     {