diff options
| author | caalador <mikael.grankvist@gmail.com> | 2017-02-06 14:55:14 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2017-02-06 14:55:14 +0200 |
| commit | 5f9681bbb79ae103ad193697361fe109030c4058 (patch) | |
| tree | 9bf8afe499d1d5fd2a9e427538c771c28498a1d5 /compatibility-client | |
| parent | 567b9cb5e6a73939244a4a749452035d0d327b55 (diff) | |
| download | vaadin-framework-5f9681bbb79ae103ad193697361fe109030c4058.tar.gz vaadin-framework-5f9681bbb79ae103ad193697361fe109030c4058.zip | |
Fix problem with re-opening the popup (#8446) (#8451)
* Fix problem with re-opening the popup (#8446)
Fixed problem that disables opening of popup
after closing it by clicking the datefield-button.
* Fix issue #8446 in compatibility version PopupDateField also.
Diffstat (limited to 'compatibility-client')
| -rw-r--r-- | compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java index c4d9a6153b..42fc0514d4 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java @@ -429,7 +429,9 @@ public class VPopupCalendar extends VTextualDate @Override public void onClick(ClickEvent event) { if (event.getSource() == calendarToggle && isEnabled()) { - if (!preventOpenPopupCalendar) { + if (open) { + closeCalendarPanel(); + } else if (!preventOpenPopupCalendar) { openCalendarPanel(); } preventOpenPopupCalendar = false; |