summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorDenis Anisimov <denis@vaadin.com>2014-04-01 20:26:46 +0300
committerVaadin Code Review <review@vaadin.com>2014-04-15 10:51:06 +0000
commit0cb1704336a10653bde82aa0470c25c49539f38b (patch)
tree4397e9758aabc4c8a2aa56cb07807d1e1b1a4023 /client
parent4a3fe8e346ba2f3376492836763383d53e9be689 (diff)
downloadvaadin-framework-0cb1704336a10653bde82aa0470c25c49539f38b.tar.gz
vaadin-framework-0cb1704336a10653bde82aa0470c25c49539f38b.zip
Disable/enable text field for DateField on setEnable() method (#13124).
Change-Id: I49222e44f75ff228219042360f1764077da1016c
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VPopupCalendar.java1
-rw-r--r--client/src/com/vaadin/client/ui/VTextualDate.java6
2 files changed, 7 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupCalendar.java b/client/src/com/vaadin/client/ui/VPopupCalendar.java
index e180239fc1..b4f0cfa18d 100644
--- a/client/src/com/vaadin/client/ui/VPopupCalendar.java
+++ b/client/src/com/vaadin/client/ui/VPopupCalendar.java
@@ -459,6 +459,7 @@ public class VPopupCalendar extends VTextualDate implements Field,
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
+ calendarToggle.setEnabled(enabled);
Roles.getButtonRole().setAriaDisabledState(calendarToggle.getElement(),
!enabled);
}
diff --git a/client/src/com/vaadin/client/ui/VTextualDate.java b/client/src/com/vaadin/client/ui/VTextualDate.java
index 44a3321f6f..37a27b2580 100644
--- a/client/src/com/vaadin/client/ui/VTextualDate.java
+++ b/client/src/com/vaadin/client/ui/VTextualDate.java
@@ -216,6 +216,12 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler,
}
+ @Override
+ public void setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+ text.setEnabled(enabled);
+ }
+
protected void setPrompting(boolean prompting) {
this.prompting = prompting;
if (prompting) {