From a0d39e1b49acb46b0c39e3719689a149f46372c5 Mon Sep 17 00:00:00 2001 From: DanielApt Date: Tue, 29 Sep 2015 15:28:58 +0100 Subject: [PATCH] Make sure scroll is at the start/end when the reach start/end event fires --- src/js/plugin/update-scroll.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/js/plugin/update-scroll.js b/src/js/plugin/update-scroll.js index 90a4177..0d5b0c9 100644 --- a/src/js/plugin/update-scroll.js +++ b/src/js/plugin/update-scroll.js @@ -43,11 +43,13 @@ module.exports = function (element, axis, value) { } if (axis === 'top' && value <= 0) { + element.scrollTop = 0; element.dispatchEvent(yStartEvent); return; // don't allow negative scroll } if (axis === 'left' && value <= 0) { + element.scrollLeft = 0; element.dispatchEvent(xStartEvent); return; // don't allow negative scroll } @@ -55,11 +57,13 @@ module.exports = function (element, axis, value) { var i = instances.get(element); if (axis === 'top' && value > i.contentHeight - i.containerHeight) { + element.scrollTop = i.contentHeight - i.containerHeight; element.dispatchEvent(yEndEvent); return; // don't allow scroll past container } if (axis === 'left' && value > i.contentWidth - i.containerWidth) { + element.scrollLeft = i.contentWidth - i.containerWidth; element.dispatchEvent(xEndEvent); return; // don't allow scroll past container }