1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Fixed flickering and simplified calculations

- Removed offending line causing a flicker to the default top state
- Simplified calculation of the top offset when in the bottom state
This commit is contained in:
Suleman Chikhalia 2014-02-27 00:39:46 -08:00
parent 1e06cdff2f
commit f7c360d620

View file

@ -55,8 +55,6 @@
var offsetTop = offset.top
var offsetBottom = offset.bottom
if (this.affixed == 'top') position.top += scrollTop
if (typeof offset != 'object') offsetBottom = offsetTop = offset
if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
@ -84,7 +82,7 @@
.trigger($.Event(affixType.replace('affix', 'affixed')))
if (affix == 'bottom') {
this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
this.$element.offset({ top: position.top })
}
}