Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/directive.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
const ctx = '@@InfiniteScroll';

var throttle = function (fn, delay) {
var throttle = function (eventTarget, fn, delay) {
var now, lastExec, timer, context, args; //eslint-disable-line

var execute = function () {
fn.apply(context, args);
lastExec = now;
};

return function () {
var resetTimeout = function() {
if (timer) {
clearTimeout(timer);
timer = null;
}
};

var listener = function() {
context = this;
args = arguments;

now = Date.now();

if (timer) {
clearTimeout(timer);
timer = null;
}
resetTimeout();

if (lastExec) {
var diff = delay - (now - lastExec);
Expand All @@ -32,6 +36,13 @@ var throttle = function (fn, delay) {
execute();
}
};

eventTarget.addEventListener('scroll', listener);

return function() {
resetTimeout();
eventTarget.removeEventListener('scroll', listener);
};
};

var getScrollTop = function (element) {
Expand Down Expand Up @@ -104,11 +115,10 @@ var doBind = function () {
directive.throttleDelay = throttleDelay;

directive.scrollEventTarget = getScrollEventTarget(element);
directive.scrollListener = throttle(doCheck.bind(directive), directive.throttleDelay);
directive.scrollEventTarget.addEventListener('scroll', directive.scrollListener);
directive.scrollListenerRemover = throttle(directive.scrollEventTarget, doCheck.bind(directive), directive.throttleDelay);

this.vm.$on('hook:beforeDestroy', function () {
directive.scrollEventTarget.removeEventListener('scroll', directive.scrollListener);
directive.scrollListenerRemover();
});

var disabledExpr = element.getAttribute('infinite-scroll-disabled');
Expand Down Expand Up @@ -210,7 +220,8 @@ export default {
},

unbind(el) {
if (el && el[ctx] && el[ctx].scrollEventTarget)
el[ctx].scrollEventTarget.removeEventListener('scroll', el[ctx].scrollListener);
if (el && el[ctx] && el[ctx].scrollListenerRemover) {
el[ctx].scrollListenerRemover();
}
}
};