Changeset 57592 in webkit

Timestamp:

Apr 14, 2010 11:42:10 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-14 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Console: Shift-Tab does not cycle autocompletions in the reverse order
​https://bugs.webkit.org/show_bug.cgi?id=37582

• inspector/front-end/TextPrompt.js: (WebInspector.TextPrompt.prototype.complete): (WebInspector.TextPrompt.prototype._completionsReady): (WebInspector.TextPrompt.prototype._tabKeyPressed):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextPrompt.js (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-14  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Console: Shift-Tab does not cycle autocompletions in the reverse order
+        https://bugs.webkit.org/show_bug.cgi?id=37582
+
+        * inspector/front-end/TextPrompt.js:
+        (WebInspector.TextPrompt.prototype.complete):
+        (WebInspector.TextPrompt.prototype._completionsReady):
+        (WebInspector.TextPrompt.prototype._tabKeyPressed):
+
 2010-04-14  Jeff Schiller  <codedread@gmail.com>
 

trunk/WebCore/inspector/front-end/TextPrompt.js

@@ -173 +173 @@
     },
 
-    complete: function(auto)
+    complete: function(auto, reverse)
     {
         this.clearAutoComplete(true);
@@ -186 +186 @@
             return;
         var wordPrefixRange = selectionRange.startContainer.rangeOfWord(selectionRange.startOffset, this.completionStopCharacters, this.element, "backward");
-        this.completions(wordPrefixRange, auto, this._completionsReady.bind(this, selection, auto, wordPrefixRange));
-    },
-
-    _completionsReady: function(selection, auto, originalWordPrefixRange, completions)
+        this.completions(wordPrefixRange, auto, this._completionsReady.bind(this, selection, auto, wordPrefixRange, reverse));
+    },
+
+    _completionsReady: function(selection, auto, originalWordPrefixRange, reverse, completions)
     {
         if (!completions || !completions.length)
@@ -213 +213 @@
                     foundIndex = i;
 
-            if (foundIndex === null || (foundIndex + 1) >= completions.length)
+            var nextIndex = foundIndex + (reverse ? -1 : 1);
+            if (foundIndex === null || nextIndex >= completions.length)
                 var completionText = completions[0];
+            else if (nextIndex < 0)
+                var completionText = completions[completions.length - 1];
             else
-                var completionText = completions[foundIndex + 1];
+                var completionText = completions[nextIndex];
         }
 
@@ -355 +358 @@
         event.stopPropagation();
 
-        this.complete();
+        this.complete(false, event.shiftKey);
     },