diff options
| author | fat <[email protected]> | 2013-12-24 13:43:47 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-24 13:43:47 -0800 |
| commit | 073f8c049d9d669bfc57315e7b3267ab422e599c (patch) | |
| tree | cfefa835dab4be1ade0a024772aef77c32fc45be | |
| parent | f689a26a1cfa09eeeaa29137c1af7f91c94fc344 (diff) | |
| parent | 139b395dfbb6898746dfc3c0b03966d126b68750 (diff) | |
| download | bootstrap-073f8c049d9d669bfc57315e7b3267ab422e599c.tar.xz bootstrap-073f8c049d9d669bfc57315e7b3267ab422e599c.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | js/affix.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/affix.js b/js/affix.js index 2fbafc6a8..94d3cc224 100644 --- a/js/affix.js +++ b/js/affix.js @@ -57,8 +57,8 @@ if (this.affixed == 'top') position.top += scrollTop if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() + if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : |