From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 30 Apr 2012 14:39:06 +0000 (-0400)
Subject: Revert "Sortable: Always set placeholder size when necessary. Fixes #8262 - jQuery... 
X-Git-Tag: 1.9.0m8~59
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21df5c27e312c6e5fda66e602abefa51c484d676;p=jquery-ui.git

Revert "Sortable: Always set placeholder size when necessary. Fixes #8262 - jQuery UI 1.8.19 don't respect forcePlaceholderSize."

This reverts commit 4f19289c10e733a07cf60435c2e5df4ed2e23d37.
---

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 3378192c9..a6903b263 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -673,8 +673,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)); };
 				}
 			};
 		}