From 88312a0e23e796d15504290201973974479531f2 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Tue, 26 Feb 2008 09:14:13 +0000 Subject: [PATCH] Fixed variable changing bugs. svn changeset:3927/svn branch:trunk --- .../terminal/gwt/client/ui/CalendarPanel.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java index bcf897696e..f7bb56d312 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java @@ -290,6 +290,19 @@ public class CalendarPanel extends FlexTable implements MouseListener, showingDate.setMonth(showingDate.getMonth() + 1); updateCalendar(); } + if (datefield.getCurrentResolution() == IDateField.RESOLUTION_YEAR + || datefield.getCurrentResolution() == IDateField.RESOLUTION_MONTH) { + // Due to current UI, update variable if res=year/month + datefield.setCurrentDate(new Date(showingDate.getTime())); + if (datefield.getCurrentResolution() == IDateField.RESOLUTION_MONTH) { + datefield.getClient().updateVariable(datefield.getId(), + "month", datefield.getCurrentDate().getMonth() + 1, + false); + } + datefield.getClient().updateVariable(datefield.getId(), "year", + datefield.getCurrentDate().getYear() + 1900, + datefield.isImmediate()); + } } private Timer timer; @@ -393,7 +406,13 @@ public class CalendarPanel extends FlexTable implements MouseListener, } cal.datefield.getCurrentDate().setTime(newDate.getTime()); cal.datefield.getClient().updateVariable(cal.datefield.getId(), - "day", cal.datefield.getCurrentDate().getDate(), + "day", cal.datefield.getCurrentDate().getDate(), false); + cal.datefield.getClient().updateVariable(cal.datefield.getId(), + "month", cal.datefield.getCurrentDate().getMonth() + 1, + false); + cal.datefield.getClient().updateVariable(cal.datefield.getId(), + "year", + cal.datefield.getCurrentDate().getYear() + 1900, cal.datefield.isImmediate()); updateCalendar(); -- 2.39.5