diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2011-07-26 07:19:34 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2011-07-26 07:19:34 +0000 |
| commit | 57a7c4e450d0850eba186ff0773c591c732b05c9 (patch) | |
| tree | bc7df2b6ecc9245d060ca2c2d8b1bf2cade9d420 | |
| parent | be966740d22ef5b4b24a8d9213e19ff694b417f1 (diff) | |
| download | vaadin-framework-57a7c4e450d0850eba186ff0773c591c732b05c9.tar.gz vaadin-framework-57a7c4e450d0850eba186ff0773c591c732b05c9.zip | |
Fixes disabled shim appearing behind Table in IE #7324
svn changeset:19940/svn branch:6.6
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/table/table.css | 6 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index 773a41c661..156c1c3e50 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -31,6 +31,12 @@ position:relative; } +.v-ie6 .v-table.v-disabled, +.v-ie7 .v-table.v-disabled{ + /* Fixes ie issue #7324 where disabled shim does not cover table body */ + position:relative; +} + .v-table-footer-wrap, .white .v-table-footer-wrap { text-transform: none; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 6330459d3c..a00c8838d5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -804,6 +804,18 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, enabled = !uidl.hasAttribute("disabled"); + if (BrowserInfo.get().isIE8() && !enabled) { + /* + * The disabled shim will not cover the table body if it is + * relative in IE8. See #7324 + */ + scrollBodyPanel.getElement().getStyle() + .setPosition(Position.STATIC); + } else if (BrowserInfo.get().isIE8()) { + scrollBodyPanel.getElement().getStyle() + .setPosition(Position.RELATIVE); + } + this.client = client; paintableId = uidl.getStringAttribute("id"); immediate = uidl.getBooleanAttribute("immediate"); |