diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-02-24 13:43:01 +0200 |
---|---|---|
committer | Johannes Dahlström <johannesd@vaadin.com> | 2015-02-24 12:42:29 +0000 |
commit | 4ee04a8348bc5645ed9b1d00807c64bb36ecb3ba (patch) | |
tree | 97cabebce121873b28ce094ed7a540356fa29ad8 /client | |
parent | 7a031a8653bfffe5d126d8a221a3374b611711e5 (diff) | |
download | vaadin-framework-4ee04a8348bc5645ed9b1d00807c64bb36ecb3ba.tar.gz vaadin-framework-4ee04a8348bc5645ed9b1d00807c64bb36ecb3ba.zip |
Fix Escalator size changes when scrolled to bottom (#16382)
Change-Id: Iaf8b21e9c6a09e51667eebae1fdd4b1f5ebabedd
Diffstat (limited to 'client')
-rw-r--r-- | client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java index e4924e9509..21f56c6c4d 100644 --- a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java +++ b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java @@ -428,8 +428,6 @@ public abstract class ScrollbarBundle implements DeferredWorker { @Override public void onScroll(ScrollEvent event) { setOffsetSizeNow(px); - offsetSizeTemporaryScrollHandler.removeHandler(); - offsetSizeTemporaryScrollHandler = null; } }); setScrollPos(0); @@ -443,6 +441,10 @@ public abstract class ScrollbarBundle implements DeferredWorker { recalculateMaxScrollPos(); forceScrollbar(showsScrollHandle()); fireVisibilityChangeIfNeeded(); + if (offsetSizeTemporaryScrollHandler != null) { + offsetSizeTemporaryScrollHandler.removeHandler(); + offsetSizeTemporaryScrollHandler = null; + } } /** @@ -609,8 +611,6 @@ public abstract class ScrollbarBundle implements DeferredWorker { @Override public void onScroll(ScrollEvent event) { setScrollSizeNow(px); - scrollSizeTemporaryScrollHandler.removeHandler(); - scrollSizeTemporaryScrollHandler = null; } }); setScrollPos(0); @@ -624,6 +624,10 @@ public abstract class ScrollbarBundle implements DeferredWorker { recalculateMaxScrollPos(); forceScrollbar(showsScrollHandle()); fireVisibilityChangeIfNeeded(); + if (scrollSizeTemporaryScrollHandler != null) { + scrollSizeTemporaryScrollHandler.removeHandler(); + scrollSizeTemporaryScrollHandler = null; + } } /** |