Merge pull request twbs#12862 from sultano/patch-1

fat · fat · commit fa4379de080d · 2014-03-16T20:24:21.000-07:00
Fixed flickering and simplified calculations
diff --git a/js/affix.js b/js/affix.js
@@ -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 })
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@`
`55`	`55`	`var offsetTop = offset.top`
`56`	`56`	`var offsetBottom = offset.bottom`
`57`	`57`
`58`		`- if (this.affixed == 'top') position.top += scrollTop`
`59`		`-`
`60`	`58`	`if (typeof offset != 'object') offsetBottom = offsetTop = offset`
`61`	`59`	`if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)`
`62`	`60`	`if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)`
`@@ -84,7 +82,7 @@`
`84`	`82`	`.trigger($.Event(affixType.replace('affix', 'affixed')))`
`85`	`83`
`86`	`84`	`if (affix == 'bottom') {`
`87`		`- this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })`
	`85`	`+ this.$element.offset({ top: position.top })`
`88`	`86`	`}`
`89`	`87`	`}`
`90`	`88`