From a49946557f759aa3b522a96ec37a9b546a03e5c3 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 7 Feb 2011 11:15:07 +0000 Subject: [PATCH] #5881 - InlineDateField without a set value shows a value in the UI but returns null svn changeset:17177/svn branch:6.5 --- .../gwt/client/ui/VCalendarPanel.java | 5 + .../InlineDateFieldSecondValueChange.html | 137 ----------- .../datefield/InlineDateFieldValueChange.html | 231 ++++++++++++++++++ 3 files changed, 236 insertions(+), 137 deletions(-) delete mode 100644 tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html create mode 100644 tests/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java index b230220eaa..1f9bffac66 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java @@ -254,6 +254,11 @@ public class VCalendarPanel extends FocusableFlexTable implements */ private void selectFocused() { if (focusedDate != null) { + if (value == null) { + // No previously selected value (set to null on server side). + // Create a new date using current date and time + value = new Date(); + } /* * #5594 set Date (day) to 1 in order to prevent any kind of * wrapping of months when later setting the month. (e.g. 31 -> diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html deleted file mode 100644 index d82d4e02b5..0000000000 --- a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldSecondValueChange.html +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - -New Test - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
InlineDateFieldSecondValueChange
open/run/com.vaadin.tests.components.datefield.InlineDateFieldTest?restartApplication
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item08,6
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item430,8
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item072,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item223,12
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item042,7
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item446,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item458,6
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item296,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item029,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item343,8
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item268,2
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[3]/domChild[0]15,11
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_0325,15
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_03. ValueChangeEvent, new value: Dec 14, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[2]/domChild[0]20,6
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_04. ValueChangeEvent, new value: Dec 13, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]11,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[2]/domChild[0]18,12
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_0145,9
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_05. ValueChangeEvent, new value: Dec 14, 2009 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]11,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[3]/domChild[3]/domChild[0]20,9
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_06. ValueChangeEvent, new value: Jan 12, 2010 12:00:00.000
- - diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html new file mode 100644 index 0000000000..6464750e72 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html @@ -0,0 +1,231 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
InlineDateFieldValueChange
open/run/com.vaadin.tests.components.datefield.InlineDateFieldTest?restartApplication
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item036,14
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item037,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item545,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item134,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item08,6
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item430,8
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item072,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item223,12
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item042,7
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item446,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item458,6
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item296,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item029,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item343,8
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item268,2
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#day1415,11
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_04. ValueChangeEvent, new value: Dec 14, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#day1320,6
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_05. ValueChangeEvent, new value: Dec 13, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]11,13
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#day1418,12
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_0145,9
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_06. ValueChangeEvent, new value: Dec 14, 2009 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]11,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#day1220,9
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_07. ValueChangeEvent, new value: Jan 12, 2010 12:00:00.000
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item046,9
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item449,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item441,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[2]/VMenuBar[0]#item062,3
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]DATE(MMMM YYYY)
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_Smenu#item127,10
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[0]/VMenuBar[0]#item365,5
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::Root/VOverlay[1]/VMenuBar[0]#item037,10
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_010. InlineDateField value: null
assertCSSClassvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#dayDATE(D)today
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#day111,10
assertCSSClassvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#dayDATE(D)today
mouseClickvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/VCalendarPanel[0]#day111,10
assertTextvaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog_row_011. ValueChangeEvent, new value: * 1, DATE(YYYY) *
+ + -- 2.39.5