Merge pull request twbs#11937 from IHomer/master

fat · fat · commit 905c78129f93 · 2014-03-13T21:45:04.000-07:00
Fix: IE10 or lower incorrectly determines the scrollheight of the body. ...
diff --git a/js/scrollspy.js b/js/scrollspy.js
@@ -64,7 +64,7 @@
 
   ScrollSpy.prototype.process = function () {
     var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+    var scrollHeight = this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
     var maxScroll    = scrollHeight - this.$scrollElement.height()
     var offsets      = this.offsets
     var targets      = this.targets
