diff options
author | Richard Worth <rdworth@gmail.com> | 2011-04-07 09:08:48 -0400 |
---|---|---|
committer | Richard Worth <rdworth@gmail.com> | 2011-04-07 09:08:48 -0400 |
commit | 54016b8469345a325e8c1ab6f8a7d17b0f0f8d01 (patch) | |
tree | 01292b351b17ee27865c2e24e1802f57771a66da /ui/jquery.ui.sortable.js | |
parent | bc6a28ee03ed2eb391ec839a05ced94a84debefe (diff) | |
download | jquery-ui-54016b8469345a325e8c1ab6f8a7d17b0f0f8d01.tar.gz jquery-ui-54016b8469345a325e8c1ab6f8a7d17b0f0f8d01.zip |
Sortable: Reverted 56b0da59d71396a740cf48a75902243d561ba186 as #4551 is invalid.
Diffstat (limited to 'ui/jquery.ui.sortable.js')
-rw-r--r-- | ui/jquery.ui.sortable.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 8356eeb9f..131fb50d0 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -614,6 +614,10 @@ $.widget("ui.sortable", $.ui.mouse, { for (var i = this.items.length - 1; i >= 0; i--){ var item = this.items[i]; + //We ignore calculating positions of all connected containers when we're not over them + if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0]) + continue; + var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item; if (!fast) { |