Skip to content

Commit

Permalink
Merge branch 'sekimura-touchmove'
Browse files Browse the repository at this point in the history
  • Loading branch information
bigspotteddog committed Jun 12, 2014
2 parents 8133e0d + d848da8 commit 1b075d2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion jquery-scrolltofixed-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions jquery-scrolltofixed.js
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,12 @@
// the target element.
$(window).bind('scroll.ScrollToFixed', windowScroll);

// For touch devices, call checkScroll directlly rather than
// rAF wrapped windowScroll to animate the element
if ('ontouchmove' in window) {
$(window).bind('touchmove.ScrollToFixed', checkScroll);
}

if (base.options.preFixed) {
target.bind('preFixed.ScrollToFixed', base.options.preFixed);
}
Expand Down

0 comments on commit 1b075d2

Please sign in to comment.