cartodb4/perfect-scrollbar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #422 from axelboc/master

Browse Source 
Fix events not triggered when scrolling past boundaries
This commit is contained in:
DanielApt 2015-12-26 13:37:29 +01:00
commit 4d7f441d1f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/plugin/update-scroll.js
View File

@ -43,29 +43,25 @@ module.exports = function (element, axis, value) {
} }
if (axis === 'top' && value <= 0) { if (axis === 'top' && value <= 0) {
element.scrollTop = 0; element.scrollTop = value = 0; // don't allow negative scroll
element.dispatchEvent(yStartEvent); element.dispatchEvent(yStartEvent);
return; // don't allow negative scroll
} }
if (axis === 'left' && value <= 0) { if (axis === 'left' && value <= 0) {
element.scrollLeft = 0; element.scrollLeft = value = 0; // don't allow negative scroll
element.dispatchEvent(xStartEvent); element.dispatchEvent(xStartEvent);
return; // don't allow negative scroll
} }
var i = instances.get(element); var i = instances.get(element);
if (axis === 'top' && value >= i.contentHeight - i.containerHeight) { if (axis === 'top' && value >= i.contentHeight - i.containerHeight) {
element.scrollTop = i.contentHeight - i.containerHeight; element.scrollTop = value = i.contentHeight - i.containerHeight; // don't allow scroll past container
element.dispatchEvent(yEndEvent); element.dispatchEvent(yEndEvent);
return; // don't allow scroll past container
} }
if (axis === 'left' && value >= i.contentWidth - i.containerWidth) { if (axis === 'left' && value >= i.contentWidth - i.containerWidth) {
element.scrollLeft = i.contentWidth - i.containerWidth; element.scrollLeft = value = i.contentWidth - i.containerWidth; // don't allow scroll past container
element.dispatchEvent(xEndEvent); element.dispatchEvent(xEndEvent);
return; // don't allow scroll past container
} }
if (!lastTop) { if (!lastTop) {