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 263eb998209779186da570e42fbfe3a77189ff53..e7a26a97fd1005d133bb8562d2953939dfdfaa4b 100644 (file)
--- 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 8529082ea5f3c8599b775c1b252ba4df349eece7..2ae4cb59ee5a592b81c8de487b7e0b1533f207fb 100644 (file)
--- 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 547af271791325423c01b41edfce4e791779c5c3..541b6e92d0611e55017446a3d7e0e78ee3729343 100644 (file)
--- 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();\r
         }\r
 \r
+        calendarToggle.setEnabled(true);\r
+        if (readonly) {\r
+            calendarToggle.addStyleName(CLASSNAME + "-button-readonly");\r
+        } else {\r
+            calendarToggle.removeStyleName(CLASSNAME + "-button-readonly");\r
+        }\r
     }\r
 \r
     @Override\r