Permalink
Browse files
draggable: fixed two missing defaults
- Loading branch information
Showing
with
5 additions
and
3 deletions.
-
+2
−2
tests/draggable.js
-
+3
−1
ui/ui.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 |
|
|
}; |
|
|
|
|
|
|
@@ -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" |
|
|
} |
|
|
}); |
|
|
0 comments on commit
77d2c66