]> source.dussan.org Git - jquery-ui.git/commitdiff
Sortable: Added a variable to track if initialization is complete. Fixes #4759 -...
authorSpoonNZ <spoonlikesham@gmail.com>
Fri, 20 Jan 2012 03:54:47 +0000 (16:54 +1300)
committerScott González <scott.gonzalez@gmail.com>
Fri, 20 Jan 2012 16:03:23 +0000 (11:03 -0500)
(cherry picked from commit ba6916f22ac3fac993975abc0f86d6cb0bf9c08d)

ui/jquery.ui.sortable.js

index 563e63c093f6cf99e9b528e93c107c01246fd047..54adacebcd2b05ef26524600dddace67c17c3ec7 100644 (file)
@@ -16,6 +16,7 @@
 
 $.widget("ui.sortable", $.ui.mouse, {
        widgetEventPrefix: "sort",
+       ready: false,
        options: {
                appendTo: "parent",
                axis: false,
@@ -57,6 +58,9 @@ $.widget("ui.sortable", $.ui.mouse, {
 
                //Initialize mouse events for interaction
                this._mouseInit();
+               
+               //We're ready to go
+               this.ready = true
 
        },
 
@@ -571,7 +575,7 @@ $.widget("ui.sortable", $.ui.mouse, {
                var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
                var connectWith = this._connectWith();
 
-               if(connectWith) {
+               if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
                        for (var i = connectWith.length - 1; i >= 0; i--){
                                var cur = $(connectWith[i]);
                                for (var j = cur.length - 1; j >= 0; j--){