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

svn changeset:2887/svn branch:trunk

1 files changed, 5 insertions, 1 deletions

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 86e67cf1b2..abc1ae8199 100644
--- 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;

 

     private ToolkitOverlay popup;

+    private boolean open = false;

 

     public IPopupCalendar() {

         super();

@@ -42,7 +43,7 @@ public class IPopupCalendar extends ITextualDate implements Paintable,
     }

 

     public void onClick(Widget sender) {

-        if (sender == calendarToggle) {

+        if (sender == calendarToggle && !open) {

             calendar.updateCalendar();

             popup.show();

             // clear previous values

@@ -63,6 +64,9 @@ public class IPopupCalendar extends ITextualDate implements Paintable,
             popup.setPopupPosition(l, t + calendarToggle.getOffsetHeight() + 2);

             popup.setWidth(w + "px");

             popup.setHeight(h + "px");

+            open = true;

+        } else {

+            open = false;

         }

     }