diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-01-08 08:53:47 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-01-08 08:53:47 +0000 |
| commit | 513a64d6345047da985db62d2112e0ec4a3ebbab (patch) | |
| tree | 8f1f45acf6235ee156e04067b0470c7fa284779c /client/src/com | |
| parent | 7e68ddca0a90eda227d0f15831a15a016c0d7675 (diff) | |
| parent | e95ef1c00efb9439686c22ef5e7a83dbdc1dbdd4 (diff) | |
| download | vaadin-framework-513a64d6345047da985db62d2112e0ec4a3ebbab.tar.gz vaadin-framework-513a64d6345047da985db62d2112e0ec4a3ebbab.zip | |
Merge "Cancel possibly pending layout timer when starting layout (#10659)"
Diffstat (limited to 'client/src/com')
| -rw-r--r-- | client/src/com/vaadin/client/LayoutManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java index d7a27ea8a4..8aa43f855f 100644 --- a/client/src/com/vaadin/client/LayoutManager.java +++ b/client/src/com/vaadin/client/LayoutManager.java @@ -61,7 +61,6 @@ public class LayoutManager { private Timer layoutTimer = new Timer() { @Override public void run() { - cancel(); layoutNow(); } }; @@ -228,6 +227,7 @@ public class LayoutManager { "Can't start a new layout phase before the previous layout phase ends."); } layoutPending = false; + layoutTimer.cancel(); try { currentDependencyTree = new LayoutDependencyTree(); doLayout(); |