Revert html content through shared state for OptionGroup

2 files changed, 9 insertions, 14 deletions

diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java
index b67edfe93c..ee9048d4c2 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java
@@ -87,7 +87,8 @@ public class VOptionGroup extends VOptionGroupBase
      */
     private boolean blurOccured = false;
 
-    private boolean htmlContentAllowed = false;
+    /** For internal use only. May be removed or replaced in the future. */
+    public boolean htmlContentAllowed = false;
 
     private boolean wasHtmlContentAllowed = false;
     private boolean wasMultiselect = false;
@@ -137,7 +138,7 @@ public class VOptionGroup extends VOptionGroupBase
             final UIDL opUidl = (UIDL) it.next();
 
             String itemHtml = opUidl.getStringAttribute("caption");
-            if (!isHtmlContentAllowed()) {
+            if (!htmlContentAllowed) {
                 itemHtml = WidgetUtil.escapeHTML(itemHtml);
             }
 
@@ -152,8 +153,7 @@ public class VOptionGroup extends VOptionGroupBase
 
             // Need to recreate object if isMultiselect is changed (#10451)
             // OR if htmlContentAllowed changed due to Safari 5 issue
-            if ((op == null)
-                    || (isHtmlContentAllowed() != wasHtmlContentAllowed)
+            if ((op == null) || (htmlContentAllowed != wasHtmlContentAllowed)
                     || (isMultiselect() != wasMultiselect)) {
                 // Create a new element
                 if (isMultiselect()) {
@@ -195,7 +195,7 @@ public class VOptionGroup extends VOptionGroupBase
             }
         }
 
-        wasHtmlContentAllowed = isHtmlContentAllowed();
+        wasHtmlContentAllowed = htmlContentAllowed;
         wasMultiselect = isMultiselect();
     }
 
@@ -311,12 +311,4 @@ public class VOptionGroup extends VOptionGroupBase
             });
         }
     }
-
-    public boolean isHtmlContentAllowed() {
-        return htmlContentAllowed;
-    }
-
-    public void setHtmlContentAllowed(boolean htmlContentAllowed) {
-        this.htmlContentAllowed = htmlContentAllowed;
-    }
 }
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java
index dbed217598..097f38f4d1 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java
@@ -26,6 +26,7 @@ import com.vaadin.client.UIDL;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.v7.client.ui.VOptionGroup;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupConstants;
 import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.v7.ui.OptionGroup;
 
@@ -34,7 +35,9 @@ public class OptionGroupConnector extends OptionGroupBaseConnector {
 
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        // HTML Content has been moved to state.
+        getWidget().htmlContentAllowed = uidl
+                .hasAttribute(OptionGroupConstants.HTML_CONTENT_ALLOWED);
+
         super.updateFromUIDL(uidl, client);
 
         getWidget().sendFocusEvents = client.hasEventListeners(this,