Merged fixes for #4206 - "Setting scroll position doesn't work with Webkit browsers...

svn changeset:11501/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
index f9da8f67d953e5665aaae3247f222941bf50c3ea..50fd8b7217cdf2b973d3ab1767fe2126ce02316a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
@@ -189,7 +189,6 @@ public class VPanel extends SimplePanel implements Container {
         }
         layout.updateFromUIDL(layoutUidl, client);
 
-        runHacks(false);
         // We may have actions attached to this panel
         if (uidl.getChildCount() > 1) {
             final int cnt = uidl.getChildCount();
@@ -224,6 +223,10 @@ public class VPanel extends SimplePanel implements Container {
             scrollLeft = contentNode.getScrollLeft();
         }
 
+        // Must be run after scrollTop is set as Webkit overflow fix re-sets the
+        // scrollTop
+        runHacks(false);
+
         rendering = false;
 
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index 838b60a6d8b0f845dc7787afa33b14cb90bc513c..033d35dab1e4b950b989192ff24ded2dee6f5ff8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -372,10 +372,6 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
 
         onResize(Window.getClientWidth(), Window.getClientHeight());
 
-        if (BrowserInfo.get().isSafari()) {
-            Util.runWebkitOverflowAutoFix(getElement());
-        }
-
         // finally set scroll position from UIDL
         if (uidl.hasVariable("scrollTop")) {
             scrollable = true;
@@ -387,6 +383,12 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
             scrollable = false;
         }
 
+        // Safari workaround must be run after scrollTop is updated as it sets
+        // scrollTop using a deferred command.
+        if (BrowserInfo.get().isSafari()) {
+            Util.runWebkitOverflowAutoFix(getElement());
+        }
+
         rendering = false;
     }