diff options
| author | Build Agent <build@vaadin.com> | 2014-03-31 22:24:10 +0300 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-31 22:24:10 +0300 |
| commit | 9422946a4009f19ebb04c83c94bae023551a8db3 (patch) | |
| tree | c842c76193ca18c1ebd2b2f99fb5debcdd384532 /client | |
| parent | 42789ab0836451aea7bc1964e0572178ef0f8ded (diff) | |
| parent | d0bc54ba4b487fe461cc950de02ec57187c654ad (diff) | |
| download | vaadin-framework-9422946a4009f19ebb04c83c94bae023551a8db3.tar.gz vaadin-framework-9422946a4009f19ebb04c83c94bae023551a8db3.zip | |
Merge changes from origin/7.1
d0bc54b Prevent popup open when datafield is disabled (#13508).
Change-Id: I3f15fa2d0774dfa0c91312d79822be94afcb0d34
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VPopupCalendar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupCalendar.java b/client/src/com/vaadin/client/ui/VPopupCalendar.java index f6dd8e7fda..e180239fc1 100644 --- a/client/src/com/vaadin/client/ui/VPopupCalendar.java +++ b/client/src/com/vaadin/client/ui/VPopupCalendar.java @@ -330,7 +330,7 @@ public class VPopupCalendar extends VTextualDate implements Field, */ public void openCalendarPanel() { - if (!open && !readonly) { + if (!open && !readonly && isEnabled()) { open = true; if (getCurrentDate() != null) { |