From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 16 Jan 2012 12:10:25 +0000 (+0000)
Subject: #5982 Add the "v-disabled" class name as-is also in addition to prefixed to make... 
X-Git-Tag: 7.0.0.alpha2~485^2~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=369635cb8912f9b0ee52471f0a6f95cc0705ea8d;p=vaadin-framework.git

#5982 Add the "v-disabled" class name as-is also in addition to prefixed to make  generic v-disabled rules work

svn changeset:22640/svn branch:6.7
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
index 5f2884391f..174e66b7aa 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
@@ -327,7 +327,8 @@ public class VFormLayout extends SimplePanel implements Container {
         }
 
         private void setStyles(String[] styles) {
-            String style = CLASSNAME;
+            String styleName = CLASSNAME;
+
             if (styles != null) {
                 for (String style : styles) {
                     if (ApplicationConnection.DISABLED_CLASSNAME.equals(style)) {
@@ -339,7 +340,8 @@ public class VFormLayout extends SimplePanel implements Container {
                     styleName += " " + CLASSNAME + "-" + style;
                 }
             }
-            setStyleName(style);
+
+            setStyleName(styleName);
         }
 
         public void updateCaption(UIDL uidl) {