Changeset 91058 in webkit

Timestamp:

Jul 15, 2011 1:10:54 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Clear the content of a search input form when 'Escape' is pressed.
​https://bugs.webkit.org/show_bug.cgi?id=51897

Source/WebCore:

This change added handleKeydownEvent() to a search input form,
which clears the form and triggers a 'search' event when 'Escape' is pressed.

Patch by Kentaro Hara <​haraken@google.com> on 2011-07-15
Reviewed by Kent Tamura.

Test: fast/forms/input-search-press-escape-key.html

• html/SearchInputType.cpp:

(WebCore::SearchInputType::handleKeydownEvent):

• html/SearchInputType.h:

LayoutTests:

The added test checks if the value in a search input form is cleared
and a 'search' event is triggered, when we press 'Escape' key.

Patch by Kentaro Hara <​haraken@google.com> on 2011-07-15
Reviewed by Kent Tamura.

• fast/forms/input-search-press-escape-key-expected.txt: Added.
• fast/forms/input-search-press-escape-key.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-search-press-escape-key-expected.txt (added)
• LayoutTests/fast/forms/input-search-press-escape-key.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/SearchInputType.cpp (modified) (2 diffs)
• Source/WebCore/html/SearchInputType.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-15  Kentaro Hara  <haraken@google.com>
+
+        Clear the content of a search input form when 'Escape' is pressed.
+        https://bugs.webkit.org/show_bug.cgi?id=51897
+
+        The added test checks if the value in a search input form is cleared
+        and a 'search' event is triggered, when we press 'Escape' key.
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/input-search-press-escape-key-expected.txt: Added.
+        * fast/forms/input-search-press-escape-key.html: Added.
+
 2011-07-14  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-15  Kentaro Hara  <haraken@google.com>
+
+        Clear the content of a search input form when 'Escape' is pressed.
+        https://bugs.webkit.org/show_bug.cgi?id=51897
+
+        This change added handleKeydownEvent() to a search input form,
+        which clears the form and triggers a 'search' event when 'Escape' is pressed.
+
+        Reviewed by Kent Tamura.
+
+        Test: fast/forms/input-search-press-escape-key.html
+
+        * html/SearchInputType.cpp:
+        (WebCore::SearchInputType::handleKeydownEvent):
+        * html/SearchInputType.h:
+
 2011-07-15  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/html/SearchInputType.cpp

@@ -33 +33 @@
 
 #include "HTMLInputElement.h"
+#include "KeyboardEvent.h"
 #include "RenderTextControlSingleLine.h"
 #include "ShadowRoot.h"
@@ -100 +101 @@
 }
 
+void SearchInputType::handleKeydownEvent(KeyboardEvent* event)
+{
+    if (element()->disabled() || element()->readOnly()) {
+        TextFieldInputType::handleKeydownEvent(event);
+        return;
+    }
+
+    const String& key = event->keyIdentifier();
+    if (key == "U+001B") {
+        RefPtr<HTMLInputElement> input = element();
+        input->setValueForUser("");
+        input->onSearch();
+        event->setDefaultHandled();
+        return;
+    }
+    TextFieldInputType::handleKeydownEvent(event);
+}
+
 void SearchInputType::destroyShadowSubtree()
 {

trunk/Source/WebCore/html/SearchInputType.h

@@ -57 +57 @@
     virtual HTMLElement* resultsButtonElement() const;
     virtual HTMLElement* cancelButtonElement() const;
+    virtual void handleKeydownEvent(KeyboardEvent*);
 
     void searchEventTimerFired(Timer<SearchInputType>*);