diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-09-29 05:31:18 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-09-29 05:31:18 +0000 |
| commit | f687d32f43351b805fcb33c4573ff1b6f23e22cd (patch) | |
| tree | 4f56ec3f1e6ec487ee86960fb7c6f3035951c9e0 | |
| parent | a17a2cc6db93164e8036fa0f2bb8ae3dd3660a47 (diff) | |
| parent | dccfdc92561b57d008eac8f017dc62857f09d399 (diff) | |
| download | vaadin-framework-f687d32f43351b805fcb33c4573ff1b6f23e22cd.tar.gz vaadin-framework-f687d32f43351b805fcb33c4573ff1b6f23e22cd.zip | |
merged [8966] from 6.1 to 6.2 branch
svn changeset:8969/svn branch:6.2
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java index fccb9e0fd2..813901a564 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java @@ -257,6 +257,13 @@ public class VCssLayout extends SimplePanel implements Paintable, Container { + String.valueOf(cssProperty.charAt(indexOf + 1)) .toUpperCase() + cssProperty.substring(indexOf + 2); } + if ("float".equals(cssProperty)) { + if (BrowserInfo.get().isIE()) { + return "styleFloat"; + } else { + return "cssFloat"; + } + } return cssProperty; } } |