fix recalc for when elements are currently stuck leafo#5

taizawa · Sep 11, 2013 · 3ecd704 · 3ecd704
1 parent 51c6a40
commit 3ecd704
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/jquery.sticky-kit.coffee b/jquery.sticky-kit.coffee
@@ -25,8 +25,13 @@ $.fn.stick_in_parent = (opts={}) ->
         parent_top = parent.offset().top + border_top + padding_top
         parent_height = parent.height()
 
-        top = elm.offset().top - parseInt elm.css("margin-top"), 10
-        height = elm.outerHeight true
+        sizing_elm = if elm.is ".is_stuck"
+          spacer
+        else
+          elm
+
+        top = sizing_elm.offset().top - parseInt sizing_elm.css("margin-top"), 10
+        height = sizing_elm.outerHeight true
 
       recalc()
       return if height == parent_height
@@ -38,6 +43,7 @@ $.fn.stick_in_parent = (opts={}) ->
         width: elm.outerWidth true
         height: height
         display: elm.css "display"
+        "vertical-align": elm.css "vertical-align"
         float: float
       })
 

diff --git a/jquery.sticky-kit.js b/jquery.sticky-kit.js
diff --git a/jquery.sticky-kit.min.js b/jquery.sticky-kit.min.js
diff --git a/site/www/src/jquery.sticky-kit.js b/site/www/src/jquery.sticky-kit.js
diff --git a/site/www/src/jquery.sticky-kit.min.js b/site/www/src/jquery.sticky-kit.min.js