Changeset 31688 in webkit

Timestamp:

Apr 7, 2008 1:01:54 PM (16 years ago)

Author:

timothy@apple.com

Message:

When the WebInspector.currentFocusElement changes, move the caret selection to be inside the focused element. This makes sure the caret moves in and out of the console when the focus changes.

Reviewed by Adam Roben.

• page/inspector/TextPrompt.js:

(TextPrompt.prototype.isCaretInsidePrompt): Just call isInsertionCaretInside.

• page/inspector/inspector.js:

(WebInspector.set currentFocusElement): Make a caret selection inside
the focused element if there isn't a range selection and there isn't
already a caret selection inside.

• page/inspector/utilities.js:

(Element.prototype.isInsertionCaretInside): Added. Tests if the
selection is collapsed and is inside the element.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/TextPrompt.js (modified) (1 diff)
• page/inspector/inspector.js (modified) (1 diff)
• page/inspector/utilities.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-07  Timothy Hatcher  <timothy@apple.com>
+
+        When the WebInspector.currentFocusElement changes, move the caret
+        selection to be inside the focused element. This makes sure the
+        caret moves in and out of the console when the focus changes.
+
+        Reviewed by Adam Roben.
+
+        * page/inspector/TextPrompt.js:
+        (TextPrompt.prototype.isCaretInsidePrompt): Just call isInsertionCaretInside.
+        * page/inspector/inspector.js: 
+        (WebInspector.set currentFocusElement): Make a caret selection inside
+        the focused element if there isn't a range selection and there isn't
+        already a caret selection inside.
+        * page/inspector/utilities.js:
+        (Element.prototype.isInsertionCaretInside): Added. Tests if the
+        selection is collapsed and is inside the element.
+
 2008-04-07  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/page/inspector/TextPrompt.js

@@ -263 +263 @@
     isCaretInsidePrompt: function()
     {
-        var selection = window.getSelection();
-        if (!selection.rangeCount || !selection.isCollapsed)
-            return false;
-        var selectionRange = selection.getRangeAt(0);
-        return selectionRange.startContainer === this.element || selectionRange.startContainer.isDescendant(this.element);
+        return this.element.isInsertionCaretInside();
     },
 

trunk/WebCore/page/inspector/inspector.js

@@ -106 +106 @@
             if (this._currentFocusElement.focused)
                 this._currentFocusElement.focused();
+
+            // Make a caret selection inside the new element if there isn't a range selection and
+            // there isn't already a caret selection inside.
+            var selection = window.getSelection();
+            if (selection.isCollapsed && !this._currentFocusElement.isInsertionCaretInside()) {
+                var selectionRange = document.createRange();
+                selectionRange.setStart(this._currentFocusElement, 0);
+                selectionRange.setEnd(this._currentFocusElement, 0);
+
+                selection.removeAllRanges();
+                selection.addRange(selectionRange);
+            }
         }
     },

trunk/WebCore/page/inspector/utilities.js

@@ -165 +165 @@
     while (this.firstChild) 
         this.removeChild(this.firstChild);        
+}
+
+Element.prototype.isInsertionCaretInside = function()
+{
+    var selection = window.getSelection();
+    if (!selection.rangeCount || !selection.isCollapsed)
+        return false;
+    var selectionRange = selection.getRangeAt(0);
+    return selectionRange.startContainer === this || selectionRange.startContainer.isDescendant(this);
 }