Merge pull request twbs#6118 from godric7/master

fat · fat · commit 2526c3fdbeb6 · 2012-12-07T14:11:18.000-08:00
scrollSpy - add parent scrollTop to offset calculation
diff --git 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, href ]] ) || null
+              && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null
           })
           .sort(function (a, b) { return a[0] - b[0] })
           .each(function () {
