aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJacob <[email protected]>2013-12-24 16:43:24 -0800
committerJacob <[email protected]>2013-12-24 16:43:24 -0800
commit0fab6e7ea77ef838adaf78adf56c951ae6e16cdc (patch)
treeac6ad64c1dfc1380d35819dd08216be613137341 /js
parentd9266aee969b2ad57851fffd77409a997ee157d1 (diff)
parent6e9efb2024e76d72ae1b39eaa2fda9f01ff7a28f (diff)
downloadbootstrap-0fab6e7ea77ef838adaf78adf56c951ae6e16cdc.tar.xz
bootstrap-0fab6e7ea77ef838adaf78adf56c951ae6e16cdc.zip
Merge pull request #11722 from DocX/patch-1
Use document scroll height instead of offset height
Diffstat (limited to 'js')
-rw-r--r--js/affix.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/affix.js b/js/affix.js
index 3ec487a78..bc11feaa8 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -83,7 +83,7 @@
.trigger($.Event(affixType.replace('affix', 'affixed')))
if (affix == 'bottom') {
- this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
+ this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
}
}