Changeset 5144

Timestamp:

03/31/08 02:22:00 (9 months ago)

Author:

braeker

Message:

Draggable - fixed #2343

Location:

trunk/ui

Files:

• ui.draggable.ext.js (modified) (1 diff)
• ui.draggable.js (modified) (3 diffs)

trunk/ui/ui.draggable.ext.js

@@ -38 +38 @@
     $.ui.plugin.add("draggable", "revert", {
         stop: function(e, ui) {
-            var self = ui.instance;
+            var self = ui.instance, helper = $(self.helper);
             self.cancelHelperRemoval = true;
+            
             $(ui.helper).animate({ left: self.originalPosition.left, top: self.originalPosition.top }, parseInt(ui.options.revert, 10) || 500, function() {
-                if(ui.options.helper != 'original') self.helper.remove();
-                self.clear();
+                if(ui.options.helper != 'original') helper.remove();
+                if (!helper) self.clear();
             });
         }

trunk/ui/ui.draggable.js

@@ -133 +133 @@
         },
         start: function(e) {
-            
             var o = this.options;
             if($.ui.ddmanager) $.ui.ddmanager.current = this;
@@ -141 +140 @@
             if(this.helper[0] != this.element[0]) this.helper.css('position', 'absolute');
             if(!this.helper.parents('body').length) this.helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-
+            
+            
             //Find out the next positioned parent
             this.offsetParent = (function(cp) {
@@ -230 +230 @@
             this.checkConstrains();
             
-            this.helper.css({ left: this.position.left+'px', top: this.position.top+'px' }); // Stick the helper to the cursor
+            $(this.helper).css({ left: this.position.left+'px', top: this.position.top+'px' }); // Stick the helper to the cursor
             if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
             return false;