Merge pull request #12862 from sultano/patch-1

Fixed flickering and simplified calculations
twbs · Mar 17, 2014 · fa4379d · fa4379d
2 parents ead17b7 + f7c360d
commit fa4379d
Showing 1 changed file with 1 addition and 3 deletions.
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 })
     }
   }