summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2012-10-26 07:42:01 +0000
committerVaadin Code Review <review@vaadin.com>2012-10-26 07:42:01 +0000
commita9b9e037606a3f7e6f5f2828d38c41d0c489d06c (patch)
treec2b4867537f22922e8921babc99ec5b7e748e978
parentcad1e360cf243d5476fd0f7601f8745835b99484 (diff)
parenta2f78adfb2ed0ffbc619c3fda194dcb830afde45 (diff)
downloadvaadin-framework-a9b9e037606a3f7e6f5f2828d38c41d0c489d06c.tar.gz
vaadin-framework-a9b9e037606a3f7e6f5f2828d38c41d0c489d06c.zip
Merge "Correctly update v-disabled for child captions (#10079)"
-rw-r--r--client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index ea4048515c..20d7beee51 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -258,7 +258,7 @@ public abstract class AbstractOrderedLayoutConnector extends
if (child instanceof AbstractFieldConnector) {
required = ((AbstractFieldConnector) child).isRequired();
}
- boolean enabled = child.getState().enabled;
+ boolean enabled = child.isEnabled();
slot.setCaption(caption, iconUrlString, styles, error, showError,
required, enabled);