From 6b10efa5284428c74c582cf2bfe55388f53a6978 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Tue, 13 Oct 2015 14:03:10 +0300 Subject: [PATCH] Remove scheduleDeferred calls from Escalator Change-Id: Idfde7842fd31be4b84a1436b40eaa932b6a6c349 --- client/src/com/vaadin/client/widgets/Escalator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java index 761edf1f11..64f18293e4 100644 --- a/client/src/com/vaadin/client/widgets/Escalator.java +++ b/client/src/com/vaadin/client/widgets/Escalator.java @@ -1872,7 +1872,7 @@ public class Escalator extends Widget implements RequiresResize, } public void autodetectRowHeightLater() { - Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() { + Scheduler.get().scheduleFinally(new Scheduler.ScheduledCommand() { @Override public void execute() { if (defaultRowHeightShouldBeAutodetected && isAttached()) { @@ -5940,7 +5940,7 @@ public class Escalator extends Widget implements RequiresResize, public void scrollToRow(final int rowIndex, final ScrollDestination destination, final int padding) throws IndexOutOfBoundsException, IllegalArgumentException { - Scheduler.get().scheduleDeferred(new ScheduledCommand() { + Scheduler.get().scheduleFinally(new ScheduledCommand() { @Override public void execute() { validateScrollDestination(destination, padding); @@ -6011,7 +6011,7 @@ public class Escalator extends Widget implements RequiresResize, public void scrollToRowAndSpacer(final int rowIndex, final ScrollDestination destination, final int padding) throws IllegalArgumentException { - Scheduler.get().scheduleDeferred(new ScheduledCommand() { + Scheduler.get().scheduleFinally(new ScheduledCommand() { @Override public void execute() { validateScrollDestination(destination, padding); @@ -6429,7 +6429,7 @@ public class Escalator extends Widget implements RequiresResize, @Override public boolean isWorkPending() { return body.domSorter.waiting || verticalScrollbar.isWorkPending() - || horizontalScrollbar.isWorkPending(); + || horizontalScrollbar.isWorkPending() || layoutIsScheduled; } @Override -- 2.39.5