diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-11-18 14:45:59 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glebm@google.com> | 2015-01-18 01:49:14 +0300 |
| commit | a51bc4ae3644420fabb7777801ba46cf5dcfde48 (patch) | |
| tree | 0d47f0993fe646af0a808211ff3b943e4037cc3e /assets | |
| parent | 0445445727423f03d0dfc457560250172a7dcfb3 (diff) | |
rake convert
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/javascripts/bootstrap/affix.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/javascripts/bootstrap/affix.js b/assets/javascripts/bootstrap/affix.js index deea294..04f389e 100644 --- a/assets/javascripts/bootstrap/affix.js +++ b/assets/javascripts/bootstrap/affix.js @@ -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 |