aboutsummaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorBuild Agent <build@vaadin.com>2014-03-31 09:57:14 +0300
committerBuild Agent <build@vaadin.com>2014-03-31 09:57:15 +0300
commit7a91d29097e606a7e2dc4440443cb21ae7dfa61b (patch)
tree9ca14ddcb808b5fe1dac963359d9c1426d5c55dd /client
parent26b897dc71b8d1b0ddf4a4d671318a7c088f652e (diff)
parent3612ce1c294208dd85405c5e5956eca49e636d75 (diff)
downloadvaadin-framework-7a91d29097e606a7e2dc4440443cb21ae7dfa61b.tar.gz
vaadin-framework-7a91d29097e606a7e2dc4440443cb21ae7dfa61b.zip
Merge changes from origin/7.1
3612ce1 Fixed aria-disabled attribute value on DateField button (#13463) Change-Id: I888e9bed47ae2a540161786791d546b2fd0f85cf
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VPopupCalendar.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupCalendar.java b/client/src/com/vaadin/client/ui/VPopupCalendar.java
index aa2aaeecc5..f6dd8e7fda 100644
--- a/client/src/com/vaadin/client/ui/VPopupCalendar.java
+++ b/client/src/com/vaadin/client/ui/VPopupCalendar.java
@@ -459,13 +459,8 @@ public class VPopupCalendar extends VTextualDate implements Field,
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
- if (enabled) {
- Roles.getButtonRole().setAriaDisabledState(
- calendarToggle.getElement(), true);
- } else {
- Roles.getButtonRole().setAriaDisabledState(
- calendarToggle.getElement(), false);
- }
+ Roles.getButtonRole().setAriaDisabledState(calendarToggle.getElement(),
+ !enabled);
}
/**