Merge branch 'top-more-than-zero' of github.com:lipsumar/fixed-sticky…

… into lipsumar-top-more-than-zero
rickydazla · Nov 11, 2013 · fa684c0 · fa684c0
2 parents c61236b + 31cf03b
commit fa684c0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/fixedsticky.js b/fixedsticky.js
@@ -54,7 +54,8 @@
 				},
 				viewportHeight = $( window ).height(),
 				position = $el.data( keys.position ),
-				skipSettingToFixed;
+				skipSettingToFixed,
+				elTop;
 
 			if( !initialOffset ) {
 				initialOffset = $el.offset().top;
@@ -82,7 +83,10 @@
 				$el.data( keys.position, position );
 			}
 
-			if( position.top && initialOffset < scroll || 
+			elTop = parseInt($(el).css('top'),10);
+			if(isNaN(elTop)) elTop = 0;
+
+			if( position.top && initialOffset < (scroll+elTop) ||
 				position.bottom && initialOffset > scroll + viewportHeight - ( height || 0 ) ) {
 
 				if( !isAlreadyOn ) {