r1998 - trunk/ui

r1998 - trunk/ui


Author: scott.gonzalez
Date: Wed Feb 4 19:44:08 2009
New Revision: 1998
Modified:
trunk/ui/ui.draggable.js
Log:
Draggable: Removed ridiculousness (some of it anyway).
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js    (original)
+++ trunk/ui/ui.draggable.js    Wed Feb 4 19:44:08 2009
@@ -439,20 +439,15 @@
        var inst = $(this).data("draggable"), o = inst.options;
        inst.sortables = [];
        $(o.connectToSortable).each(function() {
-            // 'this' points to a string, and should therefore resolved as query,
but instead, if the string is assigned to a variable, it loops through the
strings properties,
-            // so we have to append '' to make it anonymous again
-            $(typeof this == 'string' ? this+'': this).each(function() {
-                if($.data(this, 'sortable')) {
-                    var sortable = $.data(this, 'sortable');
-                    if (sortable.options.disabled) { return; }
-                    inst.sortables.push({
-                        instance: sortable,
-                        shouldRevert: sortable.options.revert
-                    });
-                    sortable._refreshItems();    //Do a one-time refresh at start to refresh
the containerCache
-                    sortable._trigger("activate", event, inst);
-                }
-            });
+            var sortable = $.data(this, 'sortable');
+            if (sortable && !sortable.options.disabled) {
+                inst.sortables.push({
+                    instance: sortable,
+                    shouldRevert: sortable.options.revert
+                });
+                sortable._refreshItems();    //Do a one-time refresh at start to refresh
the containerCache
+                sortable._trigger("activate", event, inst);
+            }
        });
    },