r1963 - in trunk: tests/unit/droppable ui
Author: rdworth
Date: Sun Feb 1 23:18:27 2009
New Revision: 1963
Modified:
trunk/tests/unit/droppable/droppable_options.js
trunk/ui/ui.droppable.js
Log:
Fixed #4037 (droppable: cssNamespace option should be removed, addClasses
option added)
Modified: trunk/tests/unit/droppable/droppable_options.js
==============================================================================
--- trunk/tests/unit/droppable/droppable_options.js (original)
+++ trunk/tests/unit/droppable/droppable_options.js Sun Feb 1 23:18:27 2009
@@ -22,22 +22,12 @@
el = $("<div></div>").droppable({ addClasses: true });
ok(el.is(".ui-droppable"), "'ui-droppable' class added");
+ el.droppable("destroy");
});
test("{ addClasses: false }", function() {
el = $("<div></div>").droppable({ addClasses: false });
ok(!el.is(".ui-droppable"), "'ui-droppable' class not added");
-});
-
-test("cssNamespace", function() {
- //cssNamespace should be appended with '-droppable' and added as className
- el = $("<div></div>").droppable({ cssNamespace: "ui" });
- equals(el[0].className, "ui-droppable");
- el.droppable("destroy");
-
- //no className should be added if cssNamepsace is null
- el = $("<div></div>").droppable({ cssNamespace: null });
- equals(el[0].className, "");
el.droppable("destroy");
});
Modified: trunk/ui/ui.droppable.js
==============================================================================
--- trunk/ui/ui.droppable.js (original)
+++ trunk/ui/ui.droppable.js Sun Feb 1 23:18:27 2009
@@ -31,7 +31,7 @@
$.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 @@
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 @@
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 @@
version: "@VERSION",
eventPrefix: 'drop',
defaults: {
+ addClasses: true,
accept: '*',
activeClass: false,
- cssNamespace: 'ui',
greedy: false,
hoverClass: false,
scope: 'default',