diff options
| author | Thomas Park <thomas@thomaspark.co> | 2015-06-16 21:40:15 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.co> | 2015-06-16 21:40:15 -0400 |
| commit | ea56c37ca9674f0155448699918650bbfcfbb888 (patch) | |
| tree | 12b2d28dc05b533adb55e0ff344c41df36d51301 /bower_components/bootstrap/js/affix.js | |
| parent | 06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff) | |
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap/js/affix.js')
| -rw-r--r-- | bower_components/bootstrap/js/affix.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bower_components/bootstrap/js/affix.js b/bower_components/bootstrap/js/affix.js index 98197642..11a3d39a 100644 --- a/bower_components/bootstrap/js/affix.js +++ b/bower_components/bootstrap/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.4 + * Bootstrap: affix.js v3.3.5 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -28,7 +28,7 @@ this.checkPosition() } - Affix.VERSION = '3.3.4' + Affix.VERSION = '3.3.5' Affix.RESET = 'affix affix-top affix-bottom' @@ -78,7 +78,7 @@ var offset = this.options.offset var offsetTop = offset.top var offsetBottom = offset.bottom - var scrollHeight = $(document.body).height() + var scrollHeight = Math.max($(document).height(), $(document.body).height()) if (typeof offset != 'object') offsetBottom = offsetTop = offset if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) |