From: John Alhroos <john.ahlroos@itmill.com>
Date: Thu, 20 May 2010 08:18:34 +0000 (+0000)
Subject: Fixes IE6 problem with #4582
X-Git-Tag: 6.7.0.beta1~1656^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=691481ec446f2088f01d5d9de2d329bac6d65760;p=vaadin-framework.git

Fixes IE6 problem with #4582

svn changeset:13264/svn branch:6.3
---

diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index 263eb99820..e7a26a97fd 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -8,11 +8,7 @@
 .v-datefield-button {
 	cursor: pointer;
 }
-/* We need to limit the scope of the .v-readonly to the date field 
- * class so the Window:s readonly value is not inherited to the
- * datefield button. See ticket #4582 for details.
- */
-.v-datefield.v-readonly .v-datefield-button {
+.v-datefield .v-datefield-button-readonly {
 	display: none;
 }
 .v-datefield-calendarpanel table {
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index 8529082ea5..2ae4cb59ee 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
@@ -252,7 +252,7 @@ td.v-datefield-calendarpanel-nextyear {
 	-webkit-border-bottom-right-radius: 0;
 	height: 14px;
 }
-.v-readonly input.v-datefield-textfield {
+.v-datefield.v-readonly input.v-datefield-textfield {
 	border-right-width: 1px;
 	border-radius: 3px;
 	-moz-border-radius: 3px;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 547af27179..541b6e92d0 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -71,6 +71,12 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
             updateWidth();
         }
 
+        calendarToggle.setEnabled(true);
+        if (readonly) {
+            calendarToggle.addStyleName(CLASSNAME + "-button-readonly");
+        } else {
+            calendarToggle.removeStyleName(CLASSNAME + "-button-readonly");
+        }
     }
 
     @Override