Fix for #5472 - PopupDateField opens the wrong month

svn changeset:14575/svn branch:6.4

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index f71d98b4c8..fdcd6d65dd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
@@ -1225,7 +1225,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
      */

     public void setDate(Date currentDate) {

 

-        // Check that we are not re-rendering a already active date if

+        // Check that we are not re-rendering an already active date

         if (currentDate == value && currentDate != null) {

             return;

         }

@@ -1233,7 +1233,9 @@ public class VCalendarPanel extends FocusableFlexTable implements
         Date oldValue = value;

         value = currentDate;

 

-        if (focusedDate == null && value != null) {

+        if (value == null) {

+            focusedDate = null;

+        } else {

             focusedDate = (Date) value.clone();

         }