r2000 - trunk/ui
r2000 - trunk/ui
Author: scott.gonzalez
Date: Wed Feb 4 20:21:21 2009
New Revision: 2000
Modified:
trunk/ui/ui.draggable.js
Log:
Draggable/Sortable: Partial fix for #4009: Fixed ui hash for sortable
activate/deactivate callback when receiving a draggable.
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Wed Feb 4 20:21:21 2009
@@ -436,7 +436,8 @@
$.ui.plugin.add("draggable", "connectToSortable", {
start: function(event, ui) {
- var inst = $(this).data("draggable"), o = inst.options;
+ var inst = $(this).data("draggable"), o = inst.options,
+ uiSortable = $.extend({}, ui, { item: inst.element });
inst.sortables = [];
$(o.connectToSortable).each(function() {
var sortable = $.data(this, 'sortable');
@@ -446,7 +447,7 @@
shouldRevert: sortable.options.revert
});
sortable._refreshItems(); //Do a one-time refresh at start to refresh
the containerCache
- sortable._trigger("activate", event, inst);
+ sortable._trigger("activate", event, uiSortable);
}
});
@@ -454,7 +455,8 @@
stop: function(event, ui) {
//If we are still over the sortable, we fake the stop event of the
sortable, but also remove helper
- var inst = $(this).data("draggable");
+ var inst = $(this).data("draggable"),
+ uiSortable = $.extend({}, ui, { item: inst.element });
$.each(inst.sortables, function() {
if(this.instance.isOver) {
@@ -478,7 +480,7 @@
} else {
this.instance.cancelHelperRemoval = false; //Remove the helper in the
sortable instance
- this.instance._trigger("deactivate", event, inst);
+ this.instance._trigger("deactivate", event, uiSortable);
}
});