From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 7 Jan 2009 10:05:00 +0000 (+0000)
Subject: fixes #2415
X-Git-Tag: 6.7.0.beta1~3411
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=66aead8f0763223c8cc949169419febc2e4df453;p=vaadin-framework.git

fixes #2415

svn changeset:6427/svn branch:trunk
---

diff --git a/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css b/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
index ff53ff33b4..360a17db07 100644
--- a/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
+++ b/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
@@ -27,7 +27,16 @@
 	width: 16px;
 	overflow: hidden; /* for IE6 */
 }
-.i-progressindicator-disabled-indeterminate {
+
+/* Hide obsolete elements in indeterminate mode */
+.i-progressindicator-indeterminate .i-progressindicator-wrapper,
+.i-progressindicator-indeterminate .i-progressindicator-indicator,
+.i-progressindicator-indeterminate-disabled .i-progressindicator-wrapper,
+.i-progressindicator-indeterminate-disabled .i-progressindicator-indicator {
+	display: none;
+}
+
+.i-progressindicator-indeterminate-disabled {
 	background: #dfe2e4 url(../common/img/blank.gif);
 	height: 16px;
 	width: 16px;
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index b7bb7e658e..cb20c81a5c 100644
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -1190,7 +1190,16 @@ input.i-modified,
 	width: 16px;
 	overflow: hidden; /* for IE6 */
 }
-.i-progressindicator-disabled-indeterminate {
+
+/* Hide obsolete elements in indeterminate mode */
+.i-progressindicator-indeterminate .i-progressindicator-wrapper,
+.i-progressindicator-indeterminate .i-progressindicator-indicator,
+.i-progressindicator-indeterminate-disabled .i-progressindicator-wrapper,
+.i-progressindicator-indeterminate-disabled .i-progressindicator-indicator {
+	display: none;
+}
+
+.i-progressindicator-indeterminate-disabled {
 	background: #dfe2e4 url(common/img/blank.gif);
 	height: 16px;
 	width: 16px;
diff --git a/WebContent/ITMILL/themes/tests-tickets/styles.css b/WebContent/ITMILL/themes/tests-tickets/styles.css
index f03a28a1c2..12c41e01fc 100644
--- a/WebContent/ITMILL/themes/tests-tickets/styles.css
+++ b/WebContent/ITMILL/themes/tests-tickets/styles.css
@@ -1253,4 +1253,12 @@ padding:2px;
   background: none !important;
   border: none !important;
   color: #222222 !important;   
+}
+
+.dispnone {
+	display:none;
+}
+
+.redborder {
+	border: 1px solid red;
 }
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
index 0567ec4012..ebd7adcd27 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
@@ -45,15 +45,12 @@ public class IProgressIndicator extends Widget implements Paintable {
 
         indeterminate = uidl.getBooleanAttribute("indeterminate");
 
-        String style = CLASSNAME;
-        if (uidl.getBooleanAttribute("disabled")) {
-            style += "-disabled";
-        }
-
         if (indeterminate) {
-            this.setStyleName(style + "-indeterminate");
+            String basename = CLASSNAME + "-indeterminate";
+            IProgressIndicator.setStyleName(getElement(), basename, true);
+            IProgressIndicator.setStyleName(getElement(), basename
+                    + "-disabled", uidl.getBooleanAttribute("disabled"));
         } else {
-            setStyleName(style);
             try {
                 final float f = Float.parseFloat(uidl
                         .getStringAttribute("state"));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2415.java b/src/com/itmill/toolkit/tests/tickets/Ticket2415.java
index 7102b0cbc3..b90cf88db2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2415.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2415.java
@@ -24,6 +24,17 @@ public class Ticket2415 extends Application {
             }
         });
 
+        final TextField tf2 = new TextField("Try to change me");
+        main.addComponent(tf2);
+
+        tf2.setImmediate(true);
+        tf2.addListener(new Property.ValueChangeListener() {
+
+            public void valueChange(ValueChangeEvent event) {
+                main.showNotification("New value = " + tf2);
+            }
+        });
+
     }
 
 }