diff options
| author | Henri Sara <hesara@vaadin.com> | 2016-07-14 15:22:39 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2016-08-11 17:01:35 +0300 |
| commit | 8b8752c520c9d2d1f0673b7edf95e56eaeea160f (patch) | |
| tree | f9421e5251e3bd4d683f3cbdbdd6acb860dbb5b7 /shared | |
| parent | 5c852b41ff22409e9f69d634f2de5df69b7815c0 (diff) | |
| download | vaadin-framework-8b8752c520c9d2d1f0673b7edf95e56eaeea160f.tar.gz vaadin-framework-8b8752c520c9d2d1f0673b7edf95e56eaeea160f.zip | |
Use shared state for OptionGroup htmlContentAllowed
Change-Id: I626165e19a1b634bd27b2e25efab88066552b190
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java | 1 | ||||
| -rw-r--r-- | shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java index 5670b64b38..c3545c9deb 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java +++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java @@ -18,7 +18,6 @@ package com.vaadin.shared.ui.optiongroup; import java.io.Serializable; public class OptionGroupConstants implements Serializable { - public static final String HTML_CONTENT_ALLOWED = "usehtml"; public static final String ATTRIBUTE_OPTION_DISABLED = "disabled"; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java index f1676e0dd8..baa4148d97 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java @@ -15,6 +15,7 @@ */ package com.vaadin.shared.ui.optiongroup; +import com.vaadin.shared.annotations.DelegateToWidget; import com.vaadin.shared.ui.select.AbstractSelectState; /** @@ -26,4 +27,7 @@ public class OptionGroupState extends AbstractSelectState { { primaryStyleName = "v-select-optiongroup"; } + + @DelegateToWidget + public boolean htmlContentAllowed = false; } |