From: Mike Robinet <mike.robinet@shavlik.com>
Date: Tue, 13 May 2014 14:57:04 +0000 (-0500)
Subject: Adjust for Scrollspy offset when calculating maxScroll.
X-Git-Tag: v3.2.0~127^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e84b0c0433509bde0b42354754372595db523e1f;p=thirdparty%2Fbootstrap.git

Adjust for Scrollspy offset when calculating maxScroll.
---

diff --git a/js/scrollspy.js b/js/scrollspy.js
index 74e016dc9f..53e1c48baa 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -69,7 +69,7 @@
   ScrollSpy.prototype.process = function () {
     var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
     var scrollHeight = this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
-    var maxScroll    = scrollHeight - this.$scrollElement.height()
+    var maxScroll    = this.options.offset + scrollHeight - this.$scrollElement.height()
     var offsets      = this.offsets
     var targets      = this.targets
     var activeTarget = this.activeTarget