diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-11-21 18:56:10 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glebm@google.com> | 2015-01-18 01:49:14 +0300 |
| commit | 2662f10a02dade84b03b1816c1f0717a49cd2fc9 (patch) | |
| tree | f92221089ae06c4cabef63717e0d26cb4e5a7093 /assets | |
| parent | a51bc4ae3644420fabb7777801ba46cf5dcfde48 (diff) | |
rake convert
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/javascripts/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index 50a4c3cc..7c304856 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -2208,7 +2208,7 @@ if (typeof jQuery === 'undefined') { 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 |