Changeset 50039 in webkit

Timestamp:

Oct 24, 2009 9:56:40 PM (15 years ago)

Author:

timothy@apple.com

Message:

WebInspector: Fixed issue with IME inside console
​https://bugs.webkit.org/show_bug.cgi?id=30660

Patch by Keishi Hattori <​casey.hattori@gmail.com> on 2009-10-24
Reviewed by Timothy Hatcher.

• inspector/front-end/ConsoleView.js:

(WebInspector.ConsoleView.prototype._promptKeyDown):

• inspector/front-end/DatabaseQueryView.js:

(WebInspector.DatabaseQueryView.prototype._promptKeyDown):

• inspector/front-end/inspector.js:

(WebInspector.loaded):
(WebInspector.searchKeyDown): Moved performSearch here from WebInspector.searchKeyUp.
(WebInspector.startEditing.element.handleKeyEvent):
(WebInspector.startEditing):

• inspector/front-end/utilities.js:

(isEnterKey): Added. Check if in IME.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-24  Keishi Hattori  <casey.hattori@gmail.com>
+
+        Reviewed by Timothy Hatcher.
+
+        WebInspector: Fixed issue with IME inside console
+        https://bugs.webkit.org/show_bug.cgi?id=30660
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype._promptKeyDown):
+        * inspector/front-end/DatabaseQueryView.js:
+        (WebInspector.DatabaseQueryView.prototype._promptKeyDown):
+        * inspector/front-end/inspector.js:
+        (WebInspector.loaded):
+        (WebInspector.searchKeyDown): Moved performSearch here from WebInspector.searchKeyUp.
+        (WebInspector.startEditing.element.handleKeyEvent):
+        (WebInspector.startEditing):
+        * inspector/front-end/utilities.js:
+        (isEnterKey): Added. Check if in IME.
+
 2009-10-24  Brian Weinstein  <bweinstein@apple.com>
 

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

@@ -401 +401 @@
     _promptKeyDown: function(event)
     {
-        switch (event.keyIdentifier) {
-            case "Enter":
-                this._enterKeyPressed(event);
-                return;
+        if (isEnterKey(event)) {
+            this._enterKeyPressed(event);
+            return;
         }
 

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

@@ -95 +95 @@
     _promptKeyDown: function(event)
     {
-        switch (event.keyIdentifier) {
-            case "Enter":
-                this._enterKeyPressed(event);
-                return;
+        if (isEnterKey(event)) {
+            this._enterKeyPressed(event);
+            return;
         }
 

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

@@ -462 +462 @@
 
     var searchField = document.getElementById("search");
-    searchField.addEventListener("keydown", this.searchKeyDown.bind(this), false);
-    searchField.addEventListener("keyup", this.searchKeyUp.bind(this), false);
     searchField.addEventListener("search", this.performSearch.bind(this), false); // when the search is emptied
 
@@ -1442 +1440 @@
 WebInspector.searchKeyDown = function(event)
 {
-    if (event.keyIdentifier !== "Enter")
-        return;
-
-    // Call preventDefault since this was the Enter key. This prevents a "search" event
-    // from firing for key down. We handle the Enter key on key up in searchKeyUp. This
-    // stops performSearch from being called twice in a row.
-    event.preventDefault();
-}
-
-WebInspector.searchKeyUp = function(event)
-{
-    if (event.keyIdentifier !== "Enter")
-        return;
+    if (!isEnterKey(event))
+        return false;
 
     // Select all of the text so the user can easily type an entirely new query.
@@ -1463 +1450 @@
     // the incremental attribute set, so we still get incremental searches.
     this.performSearch(event);
+
+    // Call preventDefault since this was the Enter key. This prevents a "search" event
+    // from firing for key down. This stops performSearch from being called twice in a row.
+    event.preventDefault();
 }
 
@@ -1641 +1632 @@
             return;
 
-        if (event.keyIdentifier === "Enter") {
+        if (isEnterKey(event)) {
             editingCommitted.call(element);
             event.preventDefault();

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

@@ -818 +818 @@
     return { formattedResult: result, unusedSubstitutions: unusedSubstitutions };
 }
+
+function isEnterKey(event) {
+    // Check if in IME.
+    return event.keyCode !== 229 && event.keyIdentifier === "Enter";
+}