Skip to content

Modified topOffset option and added $.scrollIt.destroy() function to remove event handlers #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mphasize wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Modified topOffset option and added $.scrollIt.destroy() function to remove event handlers #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5625298
Take object as offsetTop parameter, which enables dynamic setting of …
mphasize Sep 12, 2014
5fe7943
Added $.scrollIt.destroy() function to remove listeners and $.scrollI…
mphasize Sep 12, 2014
e8a48a6
Update README.md
mphasize Sep 12, 2014
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $.scrollIt({
scrollTime: 600, // how long (in ms) the animation takes
activeClass: 'active', // class given to the active nav element
onPageChange: null, // function(pageIndex) that is called when page is changed
topOffset: 0 // offste (in px) for fixed top navigation
topOffset: { val: 0 } // offste (in px) for fixed top navigation
});
```

Expand Down
39 changes: 30 additions & 9 deletions scrollIt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,16 @@
scrollTime: 600,
activeClass: 'active',
onPageChange: null,
topOffset : 0
topOffset : { val: 0}
};

var listeners = {
scroll : null,
keydown: null,
click: null,
};


$.scrollIt = function(options) {

/*
Expand All @@ -46,7 +53,7 @@
var navigate = function(ndx) {
if(ndx < 0 || ndx > lastIndex) return;

var targetTop = $('[data-scroll-index=' + ndx + ']').offset().top + settings.topOffset + 1;
var targetTop = $('[data-scroll-index=' + ndx + ']').offset().top + settings.topOffset.val + 1;
$('html,body').animate({
scrollTop: targetTop,
easing: settings.easing
Expand All @@ -61,7 +68,7 @@
var doScroll = function (e) {
var target = $(e.target).closest("[data-scroll-nav]").attr('data-scroll-nav') ||
$(e.target).closest("[data-scroll-goto]").attr('data-scroll-goto');
navigate(parseInt(target));
navigate(parseInt(target, 10));
};

/**
Expand All @@ -75,10 +82,10 @@
return false;
}
if(key == settings.upKey && active > 0) {
navigate(parseInt(active) - 1);
navigate(parseInt(active, 10) - 1);
return false;
} else if(key == settings.downKey && active < lastIndex) {
navigate(parseInt(active) + 1);
navigate(parseInt(active, 10) + 1);
return false;
}
return true;
Expand Down Expand Up @@ -106,8 +113,8 @@
var winTop = $(window).scrollTop();

var visible = $('[data-scroll-index]').filter(function(ndx, div) {
return winTop >= $(div).offset().top + settings.topOffset &&
winTop < $(div).offset().top + (settings.topOffset) + $(div).outerHeight()
return winTop >= $(div).offset().top + settings.topOffset.val &&
winTop < $(div).offset().top + (settings.topOffset.val) + $(div).outerHeight();
});
var newActive = visible.first().attr('data-scroll-index');
updateActive(newActive);
Expand All @@ -120,10 +127,24 @@

$(window).on('keydown', keyNavigation);

$('body').on('click','[data-scroll-nav], [data-scroll-goto]', function(e){
var clickHandler = function(e){
e.preventDefault();
doScroll(e);
});
};

$('body').on('click','[data-scroll-nav], [data-scroll-goto]', clickHandler);

listeners.scroll = watchActive;
listeners.keydown = keyNavigation;
listeners.click = clickHandler;
};

$.scrollIt.listeners = listeners;

$.scrollIt.destroy = function () {
$(window).off('scroll', listeners.scroll);
$(window).off('keydown', listeners.keydown);
$('body').off('click','[data-scroll-nav], [data-scroll-goto]', listeners.click);
};

}(jQuery));