library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Draggable: Clarify comments and whitespace in connectToSortable

Browse Source
This commit is contained in:
Mike Sherov 2014-08-24 21:12:16 -04:00
parent e8c99b9abf
commit 368fc8395b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/draggable.js
View File

@ -732,7 +732,6 @@ $.ui.plugin.add("draggable", "connectToSortable", {
$.each(inst.sortables, function() { $.each(inst.sortables, function() {
if (this.instance.isOver) { if (this.instance.isOver) {
this.instance.isOver = 0; this.instance.isOver = 0;
// Allow this sortable to handle removing the helper // Allow this sortable to handle removing the helper
@ -751,6 +750,8 @@ $.ui.plugin.add("draggable", "connectToSortable", {
//Trigger the stop of the sortable //Trigger the stop of the sortable
this.instance._mouseStop(event); this.instance._mouseStop(event);
// Once drag has ended, the sortable should return to using
// its original helper, not the shared helper from draggable
this.instance.options.helper = this.instance.options._helper; this.instance.options.helper = this.instance.options._helper;
} else { } else {
@ -812,7 +813,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
return ui.helper[ 0 ]; return ui.helper[ 0 ];
}; };
// Fire the start event of the sortable with our passed browser event, // Fire the start events of the sortable with our passed browser event,
// and our own helper (so it doesn't create a new one) // and our own helper (so it doesn't create a new one)
event.target = sortable.currentItem[ 0 ]; event.target = sortable.currentItem[ 0 ];
sortable._mouseCapture( event, true ); sortable._mouseCapture( event, true );
@ -829,7 +830,8 @@ $.ui.plugin.add("draggable", "connectToSortable", {
draggable._trigger( "toSortable", event ); draggable._trigger( "toSortable", event );
// draggable revert needs this variable // Inform draggable that the helper is in a valid drop zone,
// used solely in the revert option to handle "valid/invalid".
draggable.dropped = sortable.element; draggable.dropped = sortable.element;
// hack so receive/update callbacks work (mostly) // hack so receive/update callbacks work (mostly)
@ -860,7 +862,6 @@ $.ui.plugin.add("draggable", "connectToSortable", {
sortable.options.revert = false; sortable.options.revert = false;
sortable._trigger( "out", event, sortable._uiHash( sortable ) ); sortable._trigger( "out", event, sortable._uiHash( sortable ) );
sortable._mouseStop( event, true ); sortable._mouseStop( event, true );
// restore sortable behaviors that were modfied // restore sortable behaviors that were modfied
@ -879,7 +880,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
draggable._trigger( "fromSortable", event ); draggable._trigger( "fromSortable", event );
// draggable revert needs that // Inform draggable that the helper is no longer in a valid drop zone
draggable.dropped = false; draggable.dropped = false;
} }
} }