Merge remote-tracking branch 'origin/master' into grid

Change-Id: If3dd8380afe425491dfb877c08c4ff078312a3aa

1 files changed, 1 insertions, 14 deletions

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index aace349392..0c09ae49c6 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -152,20 +152,7 @@ public abstract class AbstractOrderedLayoutConnector extends
         public void onElementResize(ElementResizeEvent e) {
             updateLayoutHeight();
             if (needsExpand()) {
-                /*
-                 * updateLayoutHeight causes calling of
-                 * getLayoutManager().setNeedsMeasure(this) which informs this
-                 * LayoutManager that the size of a component might have
-                 * changed. Then a new layout phase is scheduled. So
-                 * updateExpandCompensation must be delayed until layout phase
-                 * will be completed. #12672
-                 */
-                Scheduler.get().scheduleFinally(new ScheduledCommand() {
-                    @Override
-                    public void execute() {
-                        getWidget().updateExpandCompensation();
-                    }
-                });
+                getWidget().updateExpandCompensation();
             }
         }
     };