Put date into field that was used to activate DatePicker instead of currectly focused...

[framework/web/webkit-efl.git] / Source / WebCore / html / HTMLInputElement.cpp

diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 02f0092..ecaec94 100755 (executable)
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -1060,6 +1060,10 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
 {
     if (evt->isMouseEvent() && evt->type() == eventNames().clickEvent && static_cast<MouseEvent*>(evt)->button() == LeftButton) {
         m_inputType->handleClickEvent(static_cast<MouseEvent*>(evt));
+#if ENABLE(TIZEN_INPUT_TAG_EXTENSION)
+        if(shouldUsePicker())
+            document()->setCurrentTargetNode(document()->focusedNode());
+#endif
         if (evt->defaultHandled())
             return;
     }
@@ -1076,12 +1080,17 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
         m_inputType->handleKeydownEvent(static_cast<KeyboardEvent*>(evt));
         if (evt->defaultHandled())
             return;
-#if ENABLE(TIZEN_FOCUS_UI) && ENABLE(TIZEN_INPUT_TAG_EXTENSION)
-        if (static_cast<KeyboardEvent*>(evt)->keyCode() == VK_RETURN && shouldUsePicker()
-            && document()->settings() && document()->settings()->isSpatialNavigationEnabled()) {
-            setSelectionRange(0, 0);
-            evt->setDefaultHandled();
-            return;
+
+#if ENABLE(TIZEN_INPUT_TAG_EXTENSION)
+        if (static_cast<KeyboardEvent*>(evt)->keyCode() == VK_RETURN && shouldUsePicker()) {
+            document()->setCurrentTargetNode(document()->focusedNode());
+#if ENABLE(TIZEN_FOCUS_UI)
+            if (document()->settings() && document()->settings()->isSpatialNavigationEnabled()) {
+                setSelectionRange(0, 0);
+                evt->setDefaultHandled();
+                return;
+            }
+#endif
         }
 #endif
     }