diff options
| author | Thomas Park <thomas@thomaspark.me> | 2015-01-22 22:36:20 -0500 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2015-01-22 22:36:20 -0500 |
| commit | 25f57ee1fe9773b08d95d5f7d6ba93e2db048f8f (patch) | |
| tree | 8e4448eed6bce0fa1288321e18c2b4675b8cb393 /bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js | |
| parent | 0a7f9e5bb684c185d309d1ac1079dfb8b36af33c (diff) | |
update bootstrap to 3.3.2
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js')
| -rw-r--r-- | bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js index deea2948..aaebc8c0 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.1 + * Bootstrap: affix.js v3.3.2 * http://getbootstrap.com/javascript/#affix * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -28,7 +28,7 @@ this.checkPosition() } - Affix.VERSION = '3.3.1' + Affix.VERSION = '3.3.2' Affix.RESET = 'affix affix-top affix-bottom' @@ -53,7 +53,7 @@ var colliderTop = initializing ? scrollTop : position.top var colliderHeight = initializing ? targetHeight : height - if (offsetTop != null && colliderTop <= offsetTop) return 'top' + if (offsetTop != null && scrollTop <= offsetTop) return 'top' if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' return false |