fixes #1109 DateField: small calendar icon should also close Calendar div if clicked.

svn changeset:2887/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
index 86e67cf1b273483155679336a38f6f3d45335b38..abc1ae8199e1f2e714db50f5fd76fd9db03511c3 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
@@ -17,6 +17,7 @@ public class IPopupCalendar extends ITextualDate implements Paintable,
     private CalendarPanel calendar;\r
 \r
     private ToolkitOverlay popup;\r
+    private boolean open = false;\r
 \r
     public IPopupCalendar() {\r
         super();\r
@@ -42,7 +43,7 @@ public class IPopupCalendar extends ITextualDate implements Paintable,
     }\r
 \r
     public void onClick(Widget sender) {\r
-        if (sender == calendarToggle) {\r
+        if (sender == calendarToggle && !open) {\r
             calendar.updateCalendar();\r
             popup.show();\r
             // clear previous values\r
@@ -63,6 +64,9 @@ public class IPopupCalendar extends ITextualDate implements Paintable,
             popup.setPopupPosition(l, t + calendarToggle.getOffsetHeight() + 2);\r
             popup.setWidth(w + "px");\r
             popup.setHeight(h + "px");\r
+            open = true;\r
+        } else {\r
+            open = false;\r
         }\r
     }\r
 \r