From 0e1485674d60d7e16ed7838f4499874dfdac5663 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Mon, 6 Mar 2017 15:46:39 +0200 Subject: Revert html content through shared state for OptionGroup --- .../com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java | 2 +- .../java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'compatibility-shared') 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; } -- cgit v1.2.3