summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-10-13 14:03:10 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2015-11-05 09:15:47 +0000
commit6b10efa5284428c74c582cf2bfe55388f53a6978 (patch)
tree9905796ab0a09faf59c5db2e1e1aa5ddea1d2e71
parente5f1f506de3dec7d3e63aeb92a055ba660a17239 (diff)
downloadvaadin-framework-6b10efa5284428c74c582cf2bfe55388f53a6978.tar.gz
vaadin-framework-6b10efa5284428c74c582cf2bfe55388f53a6978.zip
Remove scheduleDeferred calls from Escalator
Change-Id: Idfde7842fd31be4b84a1436b40eaa932b6a6c349
-rw-r--r--client/src/com/vaadin/client/widgets/Escalator.java8
1 files 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