Merge "Fixed issue with other stylenames being overwritten when applying primary stylename #9900"

1 files changed, 2 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/client/ui/accordion/VAccordion.java
index 0fbbcf5780..ce973f9630 100644
--- a/client/src/com/vaadin/client/ui/accordion/VAccordion.java
+++ b/client/src/com/vaadin/client/ui/accordion/VAccordion.java
@@ -89,16 +89,17 @@ public class VAccordion extends VTabsheetBase {
 
     @Override
     public void setStylePrimaryName(String style) {
+        super.setStylePrimaryName(style);
         updateStyleNames(style);
     }
 
     @Override
     public void setStyleName(String style) {
+        super.setStyleName(style);
         updateStyleNames(style);
     }
 
     protected void updateStyleNames(String primaryStyleName) {
-        super.setStyleName(primaryStyleName);
         for (Widget w : getChildren()) {
             if (w instanceof StackItem) {
                 StackItem item = (StackItem) w;