From 0cb1704336a10653bde82aa0470c25c49539f38b Mon Sep 17 00:00:00 2001
From: Denis Anisimov <denis@vaadin.com>
Date: Tue, 1 Apr 2014 20:26:46 +0300
Subject: Disable/enable text field for DateField on setEnable() method
 (#13124).

Change-Id: I49222e44f75ff228219042360f1764077da1016c
---
 client/src/com/vaadin/client/ui/VPopupCalendar.java | 1 +
 client/src/com/vaadin/client/ui/VTextualDate.java   | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'client')

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) {
-- 
cgit v1.2.3