diff options
| author | Bertjh <bertjh@hotmail.com> | 2012-04-19 09:05:37 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-19 09:06:55 -0400 |
| commit | 36d44d13e7a6c227944ddc42646b5bbe0f0e89ec (patch) | |
| tree | 9e8d389103433530e37894e876ce63e871c92060 | |
| parent | 365e1022578da9ca96bbbd29c6e2bb8049796c4a (diff) | |
| download | jquery-ui-36d44d13e7a6c227944ddc42646b5bbe0f0e89ec.tar.gz jquery-ui-36d44d13e7a6c227944ddc42646b5bbe0f0e89ec.zip | |
Sortable: Always set placeholder size when necessary. Fixes #8262 - jQuery UI 1.8.19 don't respect forcePlaceholderSize.
(cherry picked from commit 4f19289c10e733a07cf60435c2e5df4ed2e23d37)
| -rw-r--r-- | ui/jquery.ui.sortable.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 8a0941f9b..14601376e 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -674,9 +674,8 @@ $.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; - //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)); }; + p.height(self.currentItem.height()); + p.width(self.currentItem.width()); } }; } |