summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-02-07 11:15:07 +0000
committerArtur Signell <artur.signell@itmill.com>2011-02-07 11:15:07 +0000
commita49946557f759aa3b522a96ec37a9b546a03e5c3 (patch)
treeac372e5d2c90e16b7252c7272af3ff295af6e327 /src
parenta99073961d1884482c0da3a44068e0164d266a7e (diff)
downloadvaadin-framework-a49946557f759aa3b522a96ec37a9b546a03e5c3.tar.gz
vaadin-framework-a49946557f759aa3b522a96ec37a9b546a03e5c3.zip
#5881 - InlineDateField without a set value shows a value in the UI but returns null
svn changeset:17177/svn branch:6.5
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java5
1 files changed, 5 insertions, 0 deletions
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 ->