Changeset 121918 in webkit

Timestamp:

Jul 5, 2012 12:44:04 PM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: move cursor to the current search match.
​https://bugs.webkit.org/show_bug.cgi?id=90621

Reviewed by Vsevolod Vlasov.

After closing the search dialog, the cursor should be at the latest search match location.

• inspector/front-end/TextEditor.js:

(WebInspector.TextEditor.prototype.markAndRevealRange):
(WebInspector.TextEditor.prototype._handleFocused):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-05  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: move cursor to the current search match.
+        https://bugs.webkit.org/show_bug.cgi?id=90621
+
+        Reviewed by Vsevolod Vlasov.
+
+        After closing the search dialog, the cursor should be at the latest search match location.
+
+        * inspector/front-end/TextEditor.js:
+        (WebInspector.TextEditor.prototype.markAndRevealRange):
+        (WebInspector.TextEditor.prototype._handleFocused):
+
 2012-07-05  Behdad Esfahbod  <behdad@behdad.org>
 

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

@@ -159 +159 @@
     markAndRevealRange: function(range)
     {
+        if (range)
+            this._lastMarkedRange = range;
         this._mainPanel.markAndRevealRange(range);
     },
@@ -411 +413 @@
     _handleFocused: function()
     {
+        // Convert last marked range into a selection upon focus. This is needed to focus the search result.
+        if (this._lastMarkedRange) {
+            this._lastSelection = this._lastMarkedRange;
+            delete this._lastMarkedRange; 
+        }
+
         if (this._lastSelection) {
             // We do not restore selection after focus lost to avoid selection blinking. We restore only cursor position instead.