Changeset 4810

Timestamp:

06/09/08 09:58:23 (6 months ago)

Author:

magi@…

Message:

Merged [4807] from trunk to 5.2 branch: Updates all datefield variables if the value _was_ null, so that the client and sever agrees on current time. Fixes #1794 (DateField? server/client time mixup)

Location:

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui

Files:

• CalendarPanel.java (modified) (2 diffs)
• Time.java (modified) (1 diff)

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java

@@ -402 +402 @@
             try {
                 final Integer day = new Integer(text);
-                if (cal.datefield.getCurrentDate() == null) {
-                    cal.datefield.setCurrentDate(new Date());
-                }
                 final Date newDate = cal.datefield.getShowingDate();
                 newDate.setDate(day.intValue());
@@ -410 +407 @@
                     return;
                 }
-                cal.datefield.getCurrentDate().setTime(newDate.getTime());
+                if (cal.datefield.getCurrentDate() == null) {
+                    cal.datefield.setCurrentDate(new Date(newDate.getTime()));
+
+                    // Init variables with current time
+                    datefield.getClient().updateVariable(cal.datefield.getId(),
+                            "hour", newDate.getHours(), false);
+                    datefield.getClient().updateVariable(cal.datefield.getId(),
+                            "min", newDate.getMinutes(), false);
+                    datefield.getClient().updateVariable(cal.datefield.getId(),
+                            "sec", newDate.getSeconds(), false);
+                    datefield.getClient().updateVariable(cal.datefield.getId(),
+                            "msec", datefield.getMilliseconds(), false);
+                }
+
+                // cal.datefield.getCurrentDate().setTime(newDate.getTime());
                 cal.datefield.getClient().updateVariable(cal.datefield.getId(),
                         "day", cal.datefield.getCurrentDate().getDate(), false);

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java

@@ -250 +250 @@
         if (datefield.getCurrentDate() == null) {
             // was null on server, need to set
-            datefield.setCurrentDate(new Date());
+            Date now = datefield.getShowingDate();
+            if (now == null) {
+                now = new Date();
+                datefield.setShowingDate(now);
+            }
+            datefield.setCurrentDate(new Date(now.getTime()));
+
+            // Init variables with current time
+            datefield.getClient().updateVariable(datefield.getId(), "year",
+                    now.getYear() + 1900, false);
+            datefield.getClient().updateVariable(datefield.getId(), "month",
+                    now.getMonth() + 1, false);
+            datefield.getClient().updateVariable(datefield.getId(), "day",
+                    now.getDate(), false);
+            datefield.getClient().updateVariable(datefield.getId(), "hour",
+                    now.getHours(), false);
+            datefield.getClient().updateVariable(datefield.getId(), "min",
+                    now.getMinutes(), false);
+            datefield.getClient().updateVariable(datefield.getId(), "sec",
+                    now.getSeconds(), false);
+            datefield.getClient().updateVariable(datefield.getId(), "msec",
+                    datefield.getMilliseconds(), false);
         }
         if (sender == hours) {