From c205fbc4cc6753a493e1e4f499e3c34431c1b254 Mon Sep 17 00:00:00 2001 From: Richard Worth Date: Thu, 7 Apr 2011 09:08:48 -0400 Subject: [PATCH] Sortable: Reverted 56b0da59d71396a740cf48a75902243d561ba186 as #4551 is invalid. (cherry picked from commit 54016b8469345a325e8c1ab6f8a7d17b0f0f8d01) --- .../visual/sortable/sortable_ticket_4551.html | 54 ------------------- ui/jquery.ui.sortable.js | 4 ++ 2 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 tests/visual/sortable/sortable_ticket_4551.html diff --git a/tests/visual/sortable/sortable_ticket_4551.html b/tests/visual/sortable/sortable_ticket_4551.html deleted file mode 100644 index 2b83ae42e..000000000 --- a/tests/visual/sortable/sortable_ticket_4551.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Sortable Visual Test : Sortable ticket #4551 - - - - - - - - - - - - -

#4551 - Sortable connectWith fails if item is floated

- -
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
11
-
12
-
- -
-
- -
-
12
-
14
-
- - - diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 15b6b8113..aae7c6799 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -615,6 +615,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) { -- 2.39.5