Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorfat <jacobthornton@gmail.com>2012-12-22 08:27:53 +0400
committerfat <jacobthornton@gmail.com>2012-12-22 08:27:53 +0400
commite2434fefbd9d68e79d4ecae1f41b018b2c1d4199 (patch)
tree706bf9d57c274d4ac749435bc5a9556e6f210795 /js
parentf59bf470810c3be7867f6212bb0f20b97509d800 (diff)
chnage for #6248
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-scrollspy.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 873b0026b0..3d7a263264 100644
--- 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 + self.$scrollElement.scrollTop(), href ]] ) || null
+ && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {