Skip to content

Commit

Permalink
added requestAnimationFrame() on scroll
Browse files Browse the repository at this point in the history
  • Loading branch information
Tanja Gomilar committed Oct 2, 2017
1 parent 6119957 commit 318b4e0
Showing 1 changed file with 36 additions and 26 deletions.
62 changes: 36 additions & 26 deletions dist/jquery.paroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
};

$.fn.paroller = function(options) {
$.fn.paroller = function (options) {
var windowHeight = $(window).height();
var documentHeight = $(document).height();

Expand All @@ -42,7 +42,8 @@
direction: 'vertical' // horizontal
}, options);

elem.each(function(){
elem.each(function () {
var working = false;
var $this = $(this);
var offset = $this.offset().top;
var height = $this.outerHeight();
Expand All @@ -56,45 +57,54 @@
var bgOffset = Math.round(offset * factor);
var transform = Math.round((offset - (windowHeight / 2) + height) * factor);

if(type == 'background') {
if(direction == 'vertical') {
if (type == 'background') {
if (direction == 'vertical') {
setDirection.bgVertical($this, bgOffset);
}
else if(direction == 'horizontal') {
else if (direction == 'horizontal') {
setDirection.bgHorizontal($this, bgOffset);
}
}
else if(type == 'foreground') {
if(direction == 'vertical') {
else if (type == 'foreground') {
if (direction == 'vertical') {
setDirection.vertical($this, transform);
}
else if(direction == 'horizontal') {
else if (direction == 'horizontal') {
setDirection.horizontal($this, transform);
}
}

$(window).on('scroll', function(){
var scrolling = $(this).scrollTop();
bgOffset = Math.round((offset - scrolling) * factor);
transform = Math.round(((offset - (windowHeight / 2) + height) - scrolling) * factor);
var scrollAction = function () {
working = false;
};

if(type == 'background') {
if(direction == 'vertical') {
setDirection.bgVertical($this, bgOffset);
}
else if(direction == 'horizontal') {
setDirection.bgHorizontal($this, bgOffset);
}
}
else if((type == 'foreground') && (scrolling < documentHeight)) {
if(direction == 'vertical') {
setDirection.vertical($this, transform);
$(window).on('scroll', function () {
if (!working) {
var scrolling = $(this).scrollTop();
bgOffset = Math.round((offset - scrolling) * factor);
transform = Math.round(((offset - (windowHeight / 2) + height) - scrolling) * factor);

if (type == 'background') {
if (direction == 'vertical') {
setDirection.bgVertical($this, bgOffset);
}
else if (direction == 'horizontal') {
setDirection.bgHorizontal($this, bgOffset);
}
}
else if(direction == 'horizontal') {
setDirection.horizontal($this, transform);
else if ((type == 'foreground') && (scrolling < documentHeight)) {
if (direction == 'vertical') {
setDirection.vertical($this, transform);
}
else if (direction == 'horizontal') {
setDirection.horizontal($this, transform);
}
}

window.requestAnimationFrame(scrollAction);
working = true;
}
});
}).trigger('scroll');
});
};
})(jQuery);

0 comments on commit 318b4e0

Please sign in to comment.