assets/javascripts/bootstrap/affix.js in bootswatch-sass-3.3.1.4 vs assets/javascripts/bootstrap/affix.js in bootswatch-sass-3.3.2

- old
+ new

@@ -1,10 +1,10 @@ /* ======================================================================== - * 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) * ======================================================================== */ +function ($) { @@ -26,11 +26,11 @@ this.pinnedOffset = null this.checkPosition() } - Affix.VERSION = '3.3.1' + Affix.VERSION = '3.3.2' Affix.RESET = 'affix affix-top affix-bottom' Affix.DEFAULTS = { offset: 0, @@ -51,10 +51,10 @@ var initializing = this.affixed == null 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 }