diff options
| author | Mark Otto <otto@github.com> | 2012-12-26 19:21:34 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-12-26 19:21:34 +0400 |
| commit | 9749d6afc2730d41cab0111e1cc19bba7c5c3676 (patch) | |
| tree | 5420af50b680ac608d6ed177d24d79870dcad544 /js/bootstrap-scrollspy.js | |
| parent | f74990d898b08be61f0f8b514378adf223d55a4b (diff) | |
| parent | b9c7f29134f2fa81931fa4663fc40ef7a0e363d1 (diff) | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Diffstat (limited to 'js/bootstrap-scrollspy.js')
| -rw-r--r-- | js/bootstrap-scrollspy.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 54647277fe..dff9a3b375 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -59,7 +59,7 @@ , $href = /^#\w/.test(href) && $(href) return ( $href && $href.length - && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null + && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { |