From 3752211565ac034d535ad72c9f094cc644575aae Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 30 Apr 2012 10:39:06 -0400 Subject: Revert "Sortable: Always set placeholder size when necessary. Fixes #8262 - jQuery UI 1.8.19 don't respect forcePlaceholderSize." This reverts commit 4f19289c10e733a07cf60435c2e5df4ed2e23d37. (cherry picked from commit 21df5c27e312c6e5fda66e602abefa51c484d676) --- ui/jquery.ui.sortable.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 14601376e..8a0941f9b 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -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)); }; } }; } -- cgit v1.2.3