sortable: connecting draggables to a sortable and dropping them on the sortable now...

diff --git a/ui/source/ui.draggable.js b/ui/source/ui.draggable.js
index 9131d9e406f9348784cd6d89a01ddb9757ce0242..7ef5f84e600370b552160b251420152a245c5726 100644 (file)
--- a/ui/source/ui.draggable.js
+++ b/ui/source/ui.draggable.js
@@ -456,6 +456,10 @@
                                        this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)\r
                                        if(this.shouldRevert) this.instance.options.revert = true; //revert here\r
                                        this.instance.mouseStop(e);\r
+                                       \r
+                                       //Also propagate receive event, since the sortable is actually receiving a element\r
+                                       this.instance.element.triggerHandler("sortreceive", [e, $.extend(this.instance.ui(), { sender: inst.element })], this.instance.options["receive"]);\r
+\r
                                        this.instance.options.helper = "original";\r
                                }\r
                        });\r
@@ -514,7 +518,7 @@
                                                this.instance.isOver = 0;\r
                                                this.instance.cancelHelperRemoval = true;\r
                                                this.instance.options.revert = false; //No revert here\r
-                                               this.instance.mouseStop(e);\r
+                                               this.instance.mouseStop(e, true);\r
                                                this.instance.options.helper = "original";\r
                                                \r
                                                //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size\r

diff --git a/ui/source/ui.sortable.js b/ui/source/ui.sortable.js
index c0b15632e2183d76c9625836ebc49d5c60da8ecd..7ab406a59b5df59246388a51afc4f584703d2892 100644 (file)
--- a/ui/source/ui.sortable.js
+++ b/ui/source/ui.sortable.js
@@ -60,13 +60,15 @@
                                sender: inst ? inst.element : null\r
                        };              \r
                },\r
-               propagate: function(n,e,inst) {\r
+               propagate: function(n,e,inst, noPropagation) {\r
                        $.ui.plugin.call(this, n, [e, this.ui(inst)]);\r
-                       this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);\r
+                       if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);\r
                },\r
                serialize: function(o) {\r
                        \r
-                       var items = $(this.options.items, this.element).not('.ui-sortable-helper'); //Only the items of the sortable itself\r
+                       \r
+                       \r
+                       var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself\r
                        var str = []; o = o || {};\r
                        \r
                        items.each(function() {\r
@@ -78,7 +80,7 @@
                        \r
                },\r
                toArray: function(attr) {\r
-                       var items = $(this.options.items, this.element).not('.ui-sortable-helper'); //Only the items of the sortable itself\r
+                       var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself\r
                        var ret = [];\r
 \r
                        items.each(function() { ret.push($(this).attr(attr || 'id')); });\r
@@ -167,7 +169,7 @@
                                        for (var j = cur.length - 1; j >= 0; j--){\r
                                                var inst = $.data(cur[j], 'sortable');\r
                                                if(inst && !inst.options.disabled) {\r
-                                                       queries.push($.isFunction(inst.options.items) ? inst.options.items.call(this.element) : $(inst.options.items, inst.element));\r
+                                                       queries.push($.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element));\r
                                                        this.containers.push(inst);\r
                                                }\r
                                        };\r
@@ -495,7 +497,7 @@
                        return false;\r
                        \r
                },\r
-               mouseStop: function(e) {\r
+               mouseStop: function(e, noPropagation) {\r
 \r
                        //If we are using droppables, inform the manager about the drop\r
                        if ($.ui.ddmanager && !this.options.dropBehaviour)\r
@@ -512,20 +514,20 @@
                                        left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),\r
                                        top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)\r
                                }, parseInt(this.options.revert, 10) || 500, function() {\r
-                                       self.propagate("stop", e);\r
+                                       self.propagate("stop", e, null, noPropagation);\r
                                        self.clear(e);\r
                                });\r
                        } else {\r
-                               this.propagate("stop", e);\r
-                               this.clear(e);\r
+                               this.propagate("stop", e, null, noPropagation);\r
+                               this.clear(e, noPropagation);\r
                        }\r
 \r
                        return false;\r
                        \r
                },\r
-               clear: function(e) {\r
+               clear: function(e, noPropagation) {\r
                        \r
-                       if(this.domPosition != this.currentItem.prev()[0]) this.propagate("update", e); //Trigger update callback if the DOM position has changed\r
+                       if(this.domPosition != this.currentItem.prev()[0]) this.propagate("update", e, null, noPropagation); //Trigger update callback if the DOM position has changed\r
                        if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element\r
                                this.propagate("remove", e);\r
                                for (var i = this.containers.length - 1; i >= 0; i--){\r