diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2010-05-20 08:18:34 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2010-05-20 08:18:34 +0000 |
| commit | 691481ec446f2088f01d5d9de2d329bac6d65760 (patch) | |
| tree | 3ad22c9b476b26aa72f006f11b451a2bd1997e7d | |
| parent | 23a10e7327164b2688cc2da8efe571ce9b6ca6f5 (diff) | |
| download | vaadin-framework-691481ec446f2088f01d5d9de2d329bac6d65760.tar.gz vaadin-framework-691481ec446f2088f01d5d9de2d329bac6d65760.zip | |
Fixes IE6 problem with #4582
svn changeset:13264/svn branch:6.3
3 files changed, 8 insertions, 6 deletions
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
|