Changeset 96219 in webkit

Timestamp:

Sep 28, 2011 6:53:31 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

Web Inspector: live edit cursor always appears at the beginning of the file.
​https://bugs.webkit.org/show_bug.cgi?id=68900

Reviewed by Pavel Feldman.

• inspector/front-end/TextViewer.js:

(WebInspector.TextEditorMainPanel.prototype._updateSelectionOnStartEditing):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  Pavel Podivilov  <podivilov@chromium.org>
+
+        Web Inspector: live edit cursor always appears at the beginning of the file.
+        https://bugs.webkit.org/show_bug.cgi?id=68900
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextEditorMainPanel.prototype._updateSelectionOnStartEditing):
+
 2011-09-28  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -920 +920 @@
     _updateSelectionOnStartEditing: function()
     {
-        // focust() needs to go first for the case when the last selection was inside the editor and
+        // focus() needs to go first for the case when the last selection was inside the editor and
         // the "Edit" button was clicked. In this case we bail at the check below, but the
         // editor does not receive the focus, thus "Esc" does not cancel editing until at least
@@ -926 +926 @@
         this._container.focus();
         var selection = window.getSelection();
-        if (selection.rangeCount && this._container.isAncestor(selection.getRangeAt(0).commonAncestorContainer))
-            return;
+        if (selection.rangeCount) {
+            var commonAncestorContainer = selection.getRangeAt(0).commonAncestorContainer;
+            if (this._container === commonAncestorContainer || this._container.isAncestor(commonAncestorContainer))
+                return;
+        }
 
         selection.removeAllRanges();