aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-07-25 21:34:02 -0700
committerfat <[email protected]>2013-07-25 21:34:02 -0700
commit0190128ebc40c362dc618e2d4fcf52fa47b21a1d (patch)
tree5c6ad93fdd9dafd026a4c202b1cdaa87ea3157c4 /js
parent15d9c82fc5e0c93974caf655e1c3b21138781f62 (diff)
parentf1ddf7681cfe6d7c91c9523d44ee76c89c3674d6 (diff)
downloadbootstrap-0190128ebc40c362dc618e2d4fcf52fa47b21a1d.tar.xz
bootstrap-0190128ebc40c362dc618e2d4fcf52fa47b21a1d.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js')
-rw-r--r--js/scrollspy.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/scrollspy.js b/js/scrollspy.js
index af74da17d..e958021ed 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -60,7 +60,7 @@
return ($href
&& $href.length
- && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
+ && [[ $href.offset().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {