diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2017-03-06 15:46:39 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-03-07 15:43:00 +0200 |
| commit | 0e1485674d60d7e16ed7838f4499874dfdac5663 (patch) | |
| tree | d57654551d9da8cb134cb2099fb3edd69efdcd4e /compatibility-shared | |
| parent | 8f162faafa5fa26389e66f9728fc66a54b03c4c8 (diff) | |
| download | vaadin-framework-0e1485674d60d7e16ed7838f4499874dfdac5663.tar.gz vaadin-framework-0e1485674d60d7e16ed7838f4499874dfdac5663.zip | |
Revert html content through shared state for OptionGroup
Diffstat (limited to 'compatibility-shared')
2 files changed, 1 insertions, 5 deletions
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java index 01f41174bd..092d673fce 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java @@ -18,7 +18,7 @@ package com.vaadin.v7.shared.ui.optiongroup; import java.io.Serializable; public class OptionGroupConstants implements Serializable { - // Vaadin 8 option group uses state for HTML content + public static final String HTML_CONTENT_ALLOWED = "usehtml"; public static final String ATTRIBUTE_OPTION_DISABLED = "disabled"; } diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java index 167b1b31f0..ed88b4cb9f 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java @@ -15,7 +15,6 @@ */ package com.vaadin.v7.shared.ui.optiongroup; -import com.vaadin.shared.annotations.DelegateToWidget; import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** @@ -27,7 +26,4 @@ public class OptionGroupState extends AbstractSelectState { { primaryStyleName = "v-select-optiongroup"; } - - @DelegateToWidget - public boolean htmlContentAllowed = false; } |