diff options
| author | Richard Worth <rdworth@gmail.com> | 2009-02-02 07:18:27 +0000 |
|---|---|---|
| committer | Richard Worth <rdworth@gmail.com> | 2009-02-02 07:18:27 +0000 |
| commit | 4ad531044e6da304f72e80a63db66fcf8b13d8e5 (patch) | |
| tree | c38c14e958495fd3f886108f5f46967dae6966f6 /ui | |
| parent | 977c6e955d8ba1ea7bc1107e739c2cf7d7cf842a (diff) | |
| download | jquery-ui-4ad531044e6da304f72e80a63db66fcf8b13d8e5.tar.gz jquery-ui-4ad531044e6da304f72e80a63db66fcf8b13d8e5.zip | |
Fixed #4037 (droppable: cssNamespace option should be removed, addClasses option added)
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.droppable.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/ui.droppable.js b/ui/ui.droppable.js index 600f3d7a3..3c6c524e4 100644 --- a/ui/ui.droppable.js +++ b/ui/ui.droppable.js @@ -31,7 +31,7 @@ $.widget("ui.droppable", { $.ui.ddmanager.droppables[this.options.scope] = $.ui.ddmanager.droppables[this.options.scope] || []; $.ui.ddmanager.droppables[this.options.scope].push(this); - (this.options.cssNamespace && this.element.addClass(this.options.cssNamespace+"-droppable")); + (this.options.addClasses && this.element.addClass("ui-droppable")); }, @@ -42,7 +42,7 @@ $.widget("ui.droppable", { drop.splice(i, 1); this.element - .removeClass(this.options.cssNamespace+"-droppable "+this.options.cssNamespace+"-droppable-disabled") + .removeClass("ui-droppable ui-droppable-disabled") .removeData("droppable") .unbind(".droppable"); }, @@ -101,7 +101,7 @@ $.widget("ui.droppable", { if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element var childrenIntersection = false; - this.element.find(":data(droppable)").not("."+draggable.options.cssNamespace+"-draggable-dragging").each(function() { + this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() { var inst = $.data(this, 'droppable'); if(inst.options.greedy && $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)) { childrenIntersection = true; return false; @@ -136,9 +136,9 @@ $.extend($.ui.droppable, { version: "@VERSION", eventPrefix: 'drop', defaults: { + addClasses: true, accept: '*', activeClass: false, - cssNamespace: 'ui', greedy: false, hoverClass: false, scope: 'default', |