Related #2605, sticky no longer uses bottomPadding for determining bo…

…ttom edge of context. This is counterintuitive and in most cases wrong
fomantic · Jul 13, 2015 · 253bdc5 · 253bdc5
1 parent b61fef3
commit 253bdc5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/definitions/modules/sticky.js b/src/definitions/modules/sticky.js
@@ -237,8 +237,7 @@ $.fn.sticky = function(parameters) {
               },
               context = {
                 offset        : $context.offset(),
-                height        : $context.outerHeight(),
-                bottomPadding : parseInt($context.css('padding-bottom'), 10)
+                height        : $context.outerHeight()
               },
               container = {
                 height: $container.outerHeight()
@@ -260,8 +259,7 @@ $.fn.sticky = function(parameters) {
               context: {
                 top           : context.offset.top,
                 height        : context.height,
-                bottomPadding : context.bottomPadding,
-                bottom        : context.offset.top + context.height - context.bottomPadding
+                bottom        : context.offset.top + context.height
               }
             };
             module.set.containerSize();
@@ -457,8 +455,14 @@ $.fn.sticky = function(parameters) {
               }
               else if(scroll.top > element.top) {
                 module.debug('Element passed, fixing element to page');
-                module.fixTop();
+                if( (element.height + scroll.top - elementScroll) > context.bottom ) {
+                  module.bindBottom();
+                }
+                else {
+                  module.fixTop();
+                }
               }
+
             }
             else if( module.is.fixed() ) {
 
@@ -542,8 +546,7 @@ $.fn.sticky = function(parameters) {
           $module
             .css({
               left         : '',
-              top          : '',
-              marginBottom : module.cache.context.bottomPadding
+              top          : ''
             })
             .removeClass(className.fixed)
             .removeClass(className.top)