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
24 changes: 18 additions & 6 deletions jquery.scrollintoview.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*!
/*!
* jQuery scrollintoview() plugin and :scrollable selector filter
*
* Version 1.8 (14 Jul 2011)
Expand All @@ -20,7 +20,8 @@

var settings = {
duration: "fast",
direction: "both"
direction: "both",
viewPadding: 0
};

var rootrx = /^(?:html)$/i;
Expand Down Expand Up @@ -83,6 +84,17 @@
options = $.extend({}, settings, options);
options.direction = converter[typeof (options.direction) === "string" && options.direction.toLowerCase()] || converter.both;

if (typeof options.viewPadding == "number") {
options.viewPadding = { x: options.viewPadding , y: options.viewPadding };
} else if (typeof options.viewPadding == "object") {
if (options.viewPadding.x == undefined) {
options.viewPadding.x = 0;
}
if (options.viewPadding.y == undefined) {
options.viewPadding.y = 0;
}
}

var dirStr = "";
if (options.direction.x === true) dirStr = "horizontal";
if (options.direction.y === true) dirStr = dirStr ? "both" : "vertical";
Expand All @@ -101,10 +113,10 @@
};

var rel = {
top: dim.e.rect.top - (dim.s.rect.top + dim.s.border.top),
bottom: dim.s.rect.bottom - dim.s.border.bottom - dim.s.scrollbar.bottom - dim.e.rect.bottom,
left: dim.e.rect.left - (dim.s.rect.left + dim.s.border.left),
right: dim.s.rect.right - dim.s.border.right - dim.s.scrollbar.right - dim.e.rect.right
top: dim.e.rect.top - (dim.s.rect.top + dim.s.border.top) - options.viewPadding.y,
bottom: dim.s.rect.bottom - dim.s.border.bottom - dim.s.scrollbar.bottom - dim.e.rect.bottom + options.viewPadding.y,
left: dim.e.rect.left - (dim.s.rect.left + dim.s.border.left) - options.viewPadding.x,
right: dim.s.rect.right - dim.s.border.right - dim.s.scrollbar.right - dim.e.rect.right + options.viewPadding.x
};

var animOptions = {};
Expand Down