r855 - in trunk: tests ui
Author: paul.bakaus
Date: Mon Nov 3 03:24:48 2008
New Revision: 855
Modified:
trunk/tests/draggable.js
trunk/ui/ui.draggable.js
Log:
draggable: fixed two missing defaults
Modified: trunk/tests/draggable.js
==============================================================================
--- trunk/tests/draggable.js (original)
+++ trunk/tests/draggable.js Mon Nov 3 03:24:48 2008
@@ -151,7 +151,7 @@
disabled: false,
distance: 1,
grid: false,
- handle: "??? - TODO",
+ handle: false,
helper: "original",
iframeFix: false,
opacity: 1.0,
@@ -165,7 +165,7 @@
snap: false,
snapMode: "both",
snapTolerance: 20,
- stack: "??? - TODO",
+ stack: false,
zIndex: null
};
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Mon Nov 3 03:24:48 2008
@@ -321,7 +321,7 @@
},
_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 @@
defaults: {
appendTo: "parent",
axis: false,
+ handle: false,
cancel: ":input",
connectToSortable: false,
containment: false,
@@ -374,6 +375,7 @@
snap: false,
snapMode: "both",
snapTolerance: 20,
+ stack: false,
cssNamespace: "ui"
}
});