From: joep.joosten@ihomer.nl Date: Thu, 19 Dec 2013 11:18:51 +0000 (+0100) Subject: Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document... X-Git-Tag: v3.2.0~362^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bcb1cc255b2c06dff093c7d7fb9f70505629eec;p=thirdparty%2Fbootstrap.git Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used. --- diff --git a/js/scrollspy.js b/js/scrollspy.js index b41c274136..d2c9c8d4d6 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -62,7 +62,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