]> source.dussan.org Git - jquery-ui.git/commitdiff
Revert "Sortable: Always set placeholder size when necessary. Fixes #8262 - jQuery...
authorScott González <scott.gonzalez@gmail.com>
Mon, 30 Apr 2012 14:39:06 +0000 (10:39 -0400)
committerScott González <scott.gonzalez@gmail.com>
Mon, 30 Apr 2012 14:52:53 +0000 (10:52 -0400)
This reverts commit 4f19289c10e733a07cf60435c2e5df4ed2e23d37.
(cherry picked from commit 21df5c27e312c6e5fda66e602abefa51c484d676)

ui/jquery.ui.sortable.js

index 14601376e0b924fd7ab5c67dc883e3d292717c91..8a0941f9b1d522accc8af3259e0f1d734384fb95 100644 (file)
@@ -674,8 +674,9 @@ $.widget("ui.sortable", $.ui.mouse, {
                                        // 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
                                        if(className && !o.forcePlaceholderSize) return;
 
-                                       p.height(self.currentItem.height());
-                                       p.width(self.currentItem.width());
+                                       //If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+                                       if(!p.height()) { p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop')||0, 10) - parseInt(self.currentItem.css('paddingBottom')||0, 10)); };
+                                       if(!p.width()) { p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft')||0, 10) - parseInt(self.currentItem.css('paddingRight')||0, 10)); };
                                }
                        };
                }