Changeset 31120 in webkit

Timestamp:

Mar 17, 2008 11:12:59 PM (16 years ago)

Author:

timothy@apple.com

Message:

2008-03-17 Timothy Hatcher <​timothy@apple.com>

Reviewed by Mark Rowe.

Bug 17908: Various bugs in the Console completion code
​http://bugs.webkit.org/show_bug.cgi?id=17908

• page/inspector/ConsolePanel.js: (WebInspector.ConsolePanel.complete): Moved the code that checked for the caret being at the end of the prompt into the _caretAtEndOfPrompt helper function. (WebInspector.ConsolePanel.messagesSelectStart): Clear and redo the auto complete when the selection changes. (WebInspector.ConsolePanel._caretInsidePrompt): Fixed a logic error that always caused a false result. (WebInspector.ConsolePanel._caretAtEndOfPrompt): Added. Tests if the selection is a caret at the end of the prompt. (WebInspector.ConsolePanel._moveCaretToEndOfPrompt): Changed the offset to use the childNodes length. This makes sure the caret is at the end when there are multiple text nodes in the prompt.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/ConsolePanel.js (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-17  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Bug 17908: Various bugs in the Console completion code
+        http://bugs.webkit.org/show_bug.cgi?id=17908
+
+        * page/inspector/ConsolePanel.js:
+        (WebInspector.ConsolePanel.complete): Moved the code that checked for the caret being at the end
+        of the prompt into the _caretAtEndOfPrompt helper function.
+        (WebInspector.ConsolePanel.messagesSelectStart): Clear and redo the auto complete when the selection changes.
+        (WebInspector.ConsolePanel._caretInsidePrompt): Fixed a logic error that always caused a false result.
+        (WebInspector.ConsolePanel._caretAtEndOfPrompt): Added. Tests if the selection is a caret at the
+        end of the prompt.
+        (WebInspector.ConsolePanel._moveCaretToEndOfPrompt): Changed the offset to use the childNodes length.
+        This makes sure the caret is at the end when there are multiple text nodes in the prompt.
+
 2008-03-17  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/page/inspector/ConsolePanel.js

@@ -191 +191 @@
         if (!selectionRange.commonAncestorContainer.isDescendant(this.promptElement))
             return;
-
-        if (auto) {
-            if (!selection.isCollapsed)
-                return;
-
-            var node = selectionRange.startContainer;
-            if (node.nodeType === Node.TEXT_NODE && selectionRange.startOffset < node.nodeValue.length)
-                return;
-
-            var foundNextText = false;
-            while (node) {
-                if (node.nodeType === Node.TEXT_NODE && node.nodeValue.length) {
-                    if (foundNextText)
-                        return;
-                    foundNextText = true;
-                }
-
-                node = node.traverseNextNode(false, this.promptElement);
-            }
-        }
+        if (auto && !this._caretAtEndOfPrompt())
+            return;
 
         // Pass more characters to _backwardsRange so the range will be as short as possible.
@@ -339 +321 @@
             clearTimeout(this._selectionTimeout);
 
+        this.clearAutoComplete();
+
         function moveBackIfOutside()
         {
             delete this._selectionTimeout;
-            if (this._caretInsidePrompt() || !window.getSelection().isCollapsed)
-                return;
-            this._moveCaretToEndOfPrompt();
+            if (!this._caretInsidePrompt() && window.getSelection().isCollapsed)
+                this._moveCaretToEndOfPrompt();
+            this.autoCompleteSoon();
         }
 
@@ -456 +440 @@
             return false;
         var selectionRange = selection.getRangeAt(0);
-        return selectionRange.startContainer === this.promptElement && selectionRange.startContainer.isDescendant(this.promptElement);
+        return selectionRange.startContainer === this.promptElement || selectionRange.startContainer.isDescendant(this.promptElement);
+    },
+
+    _caretAtEndOfPrompt: function()
+    {
+        var selection = window.getSelection();
+        if (!selection.rangeCount || !selection.isCollapsed)
+            return false;
+
+        var selectionRange = selection.getRangeAt(0);
+        var node = selectionRange.startContainer;
+        if (node !== this.promptElement && !node.isDescendant(this.promptElement))
+            return false;
+
+        if (node.nodeType === Node.TEXT_NODE && selectionRange.startOffset < node.nodeValue.length)
+            return false;
+
+        var foundNextText = false;
+        while (node) {
+            if (node.nodeType === Node.TEXT_NODE && node.nodeValue.length) {
+                if (foundNextText)
+                    return false;
+                foundNextText = true;
+            }
+
+            node = node.traverseNextNode(false, this.promptElement);
+        }
+
+        return true;
     },
 
@@ -464 +476 @@
         var selectionRange = document.createRange();
 
-        var offset = this.promptElement.firstChild ? 1 : 0;
+        var offset = this.promptElement.childNodes.length;
         selectionRange.setStart(this.promptElement, offset);
         selectionRange.setEnd(this.promptElement, offset);