]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixes #1966 in IE6/IE7
authorArtur Signell <artur.signell@itmill.com>
Mon, 22 Sep 2008 10:28:28 +0000 (10:28 +0000)
committerArtur Signell <artur.signell@itmill.com>
Mon, 22 Sep 2008 10:28:28 +0000 (10:28 +0000)
svn changeset:5478/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java

index 48b01c51d5c0a9ea9d823f186b6e39ebb78b1030..8c5daf45519cb8a71bd707c75a1ef5db6cb41e25 100644 (file)
@@ -1202,10 +1202,17 @@ public class IOrderedLayout extends Panel implements Container,
                     }
 
                     // Construct table structure to align children
-                    final String t = "<table cellpadding='0' cellspacing='0' width='100%' height='100%'><tbody><tr><td>"
+                    String alignmentTableStructure = "<table cellpadding='0' cellspacing='0' width='100%'";
+                    if (BrowserInfo.get().isIE()) {
+                        alignmentTableStructure += " style='height: expression(this.parentElement.offsetHeight+\"px\")'";
+                    } else {
+                        alignmentTableStructure += " height='100%'";
+                    }
+                    alignmentTableStructure += "><tbody><tr><td>"
                             + "<table cellpadding='0' cellspacing='0' ><tbody><tr><td align='left'>"
                             + "</td></tr></tbody></table></td></tr></tbody></table>";
-                    DOM.setInnerHTML(getElementWrappingWidgetAndCaption(), t);
+                    DOM.setInnerHTML(getElementWrappingWidgetAndCaption(),
+                            alignmentTableStructure);
                     alignmentTD = DOM
                             .getFirstChild(DOM
                                     .getFirstChild(DOM
@@ -1243,7 +1250,7 @@ public class IOrderedLayout extends Panel implements Container,
                 // Set the alignment in td
                 DOM.setElementAttribute(alignmentTD, "align",
                         horizontalAlignment);
-                DOM.setElementAttribute(alignmentTD, "valign",
+                DOM.setElementAttribute(alignmentTD, "vAlign",
                         verticalAlignment);
 
             } else {