]> source.dussan.org Git - jquery-ui.git/commitdiff
Draggable: Clarify comments and whitespace in connectToSortable
authorMike Sherov <mike.sherov@gmail.com>
Mon, 25 Aug 2014 01:12:16 +0000 (21:12 -0400)
committerMike Sherov <mike.sherov@gmail.com>
Mon, 25 Aug 2014 22:23:11 +0000 (18:23 -0400)
ui/draggable.js

index 87176150e9f79ee5b21196885225d284b3b05b7b..7ad5d0c3765586e1f1d6ce28bcaf355d3ffe9cf8 100644 (file)
@@ -732,7 +732,6 @@ $.ui.plugin.add("draggable", "connectToSortable", {
 
                $.each(inst.sortables, function() {
                        if (this.instance.isOver) {
-
                                this.instance.isOver = 0;
 
                                // Allow this sortable to handle removing the helper
@@ -751,6 +750,8 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                //Trigger the stop of the sortable
                                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;
 
                        } else {
@@ -812,7 +813,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                                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)
                                        event.target = sortable.currentItem[ 0 ];
                                        sortable._mouseCapture( event, true );
@@ -829,7 +830,8 @@ $.ui.plugin.add("draggable", "connectToSortable", {
 
                                        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;
 
                                        // hack so receive/update callbacks work (mostly)
@@ -860,7 +862,6 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                        sortable.options.revert = false;
 
                                        sortable._trigger( "out", event, sortable._uiHash( sortable ) );
-
                                        sortable._mouseStop( event, true );
 
                                        // restore sortable behaviors that were modfied
@@ -879,7 +880,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
 
                                        draggable._trigger( "fromSortable", event );
 
-                                       // draggable revert needs that
+                                       // Inform draggable that the helper is no longer in a valid drop zone
                                        draggable.dropped = false;
                                }
                        }