diff options
| -rw-r--r-- | tests/draggable.js | 4 | ||||
| -rw-r--r-- | ui/ui.draggable.js | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/draggable.js b/tests/draggable.js index f14ab78f8..74089e72f 100644 --- a/tests/draggable.js +++ b/tests/draggable.js @@ -151,7 +151,7 @@ test("defaults", function() { disabled: false, distance: 1, grid: false, - handle: "??? - TODO", + handle: false, helper: "original", iframeFix: false, opacity: 1.0, @@ -165,7 +165,7 @@ test("defaults", function() { snap: false, snapMode: "both", snapTolerance: 20, - stack: "??? - TODO", + stack: false, zIndex: null }; diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js index c82dae461..3323f58ad 100644 --- a/ui/ui.draggable.js +++ b/ui/ui.draggable.js @@ -321,7 +321,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, { }, _clear: function() { this.helper.removeClass("ui-draggable-dragging"); - if(this.options.helper != 'original' && !this.cancelHelperRemoval) this.helper.remove(); + if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove(); //if($.ui.ddmanager) $.ui.ddmanager.current = null; this.helper = null; this.cancelHelperRemoval = false; @@ -354,6 +354,7 @@ $.extend($.ui.draggable, { defaults: { appendTo: "parent", axis: false, + handle: false, cancel: ":input", connectToSortable: false, containment: false, @@ -374,6 +375,7 @@ $.extend($.ui.draggable, { snap: false, snapMode: "both", snapTolerance: 20, + stack: false, cssNamespace: "ui" } }); |