diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-04 11:26:54 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-11-04 09:39:16 +0000 |
| commit | c48c94dc23da22b6d885c69b0bc697257f9dbf11 (patch) | |
| tree | 785700a1b58088b1fa42b81a435935543b754ee0 | |
| parent | 186696d7a7428458cf9471b4e5f29cb3d83cffa2 (diff) | |
| download | vaadin-framework-c48c94dc23da22b6d885c69b0bc697257f9dbf11.tar.gz vaadin-framework-c48c94dc23da22b6d885c69b0bc697257f9dbf11.zip | |
Reverted change in how hack works (#12727, #12736)
The fix for Window slightly altered how the hack was done, breaking #12736
Change-Id: I2d33b45421c40ce011d2e728a573f7572e326c47
| -rw-r--r-- | client/src/com/vaadin/client/Util.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java index 8a5712215d..206aa83c2b 100644 --- a/client/src/com/vaadin/client/Util.java +++ b/client/src/com/vaadin/client/Util.java @@ -556,10 +556,10 @@ public class Util { final String oldHeight = scrollable.getStyle().getHeight(); scrollable.getStyle().setWidth(110, Unit.PCT); - scrollable.getStyle().setHeight(110, Unit.PCT); scrollable.getOffsetWidth(); - scrollable.getOffsetHeight(); scrollable.getStyle().setProperty("width", oldWidth); + scrollable.getStyle().setHeight(110, Unit.PCT); + scrollable.getOffsetHeight(); scrollable.getStyle().setProperty("height", oldHeight); // Restore the scroll position |