diff options
| author | Alexey Fansky <alexey.fansky@effective-soft.com> | 2015-02-20 17:13:55 -0800 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-03-03 08:24:00 +0000 |
| commit | 2ad8f945b2b4847a539d82b6593aee42095c8c56 (patch) | |
| tree | 6524a65c73588dc07214c6c156bed08e2e8d4eff /client/src | |
| parent | 0aa4af8f266a46a93ae7817c5e04dcef79389c94 (diff) | |
| download | vaadin-framework-2ad8f945b2b4847a539d82b6593aee42095c8c56.tar.gz vaadin-framework-2ad8f945b2b4847a539d82b6593aee42095c8c56.zip | |
Restoring overflow-x and overflow-y in runWebkitOverflowAutoFix (#16650)
Change-Id: I7be1c1571ee5ede0ce481faf823f5f271a280a8a
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/WidgetUtil.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/WidgetUtil.java b/client/src/com/vaadin/client/WidgetUtil.java index 4c991b2c3d..5f88f6da46 100644 --- a/client/src/com/vaadin/client/WidgetUtil.java +++ b/client/src/com/vaadin/client/WidgetUtil.java @@ -439,7 +439,13 @@ public class WidgetUtil { if (BrowserInfo.get().requiresOverflowAutoFix()) { final String originalOverflow = elem.getStyle().getProperty( "overflow"); - if ("hidden".equals(originalOverflow)) { + final String originalOverflowX = elem.getStyle().getProperty( + "overflowX"); + final String originalOverflowY = elem.getStyle().getProperty( + "overflowY"); + if ("hidden".equals(originalOverflow) + || "hidden".equals(originalOverflowX) + || "hidden".equals(originalOverflowY)) { return; } @@ -453,6 +459,14 @@ public class WidgetUtil { public void execute() { // Dough, Safari scroll auto means actually just a moped elem.getStyle().setProperty("overflow", originalOverflow); + if (!originalOverflowX.isEmpty()) { + elem.getStyle().setProperty("overflowX", + originalOverflowX); + } + if (!originalOverflowY.isEmpty()) { + elem.getStyle().setProperty("overflowY", + originalOverflowY); + } if (scrolltop > 0 || elem.getScrollTop() > 0) { int scrollvalue = scrolltop; |