Fixed slot stylenames not being removed properly when clearing the stylenames #9576

Change-Id: I5c89d814cb9b0b28bf46a850a6ecc8d7eab56d47

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index 7a2166cde2c7b4e532e447d6afb6846c84041f7d..9707db610e43de1091d2f6d312ea0ba0a897e28c 100644 (file)
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -85,7 +85,10 @@ public abstract class AbstractOrderedLayoutConnector extends
 
             // Update slot style names
             List<String> childStyles = child.getState().styles;
-            if (childStyles != null && !childStyles.isEmpty()) {
+            if (childStyles == null) {
+                getWidget().setSlotStyleNames(child.getWidget(),
+                        (String[]) null);
+            } else {
                 getWidget().setSlotStyleNames(child.getWidget(),
                         childStyles.toArray(new String[childStyles
                                 .size()]));

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
index 91d6852f52bbff5d3681f8dfc09554d255eed007..99fd681d6307d7dca72c88f3c33fc5811c732fc6 100644 (file)
--- a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
@@ -199,8 +199,10 @@ public class VOrderedLayout extends FlowPanel {
          */
         protected void setStyleNames(String... stylenames) {
             setStyleName(SLOT_CLASSNAME);
-            for (String stylename : stylenames) {
-                addStyleDependentName(stylename);
+            if (stylenames != null) {
+                for (String stylename : stylenames) {
+                    addStyleDependentName(stylename);
+                }
             }
 
             // Ensure alignment style names are correct