r1957 - in trunk: tests/unit/draggable ui
Author: rdworth
Date: Sun Feb 1 22:45:50 2009
New Revision: 1957
Modified:
trunk/tests/unit/draggable/draggable_defaults.js
trunk/tests/unit/draggable/draggable_options.js
trunk/ui/ui.draggable.js
Log:
Fixed #4036 (draggable: cssNamespace option should be removed, addClasses
option added)
Modified: trunk/tests/unit/draggable/draggable_defaults.js
==============================================================================
--- trunk/tests/unit/draggable/draggable_defaults.js (original)
+++ trunk/tests/unit/draggable/draggable_defaults.js Sun Feb 1 22:45:50
2009
@@ -3,6 +3,7 @@
*/
var draggable_defaults = {
+ addClasses: true,
appendTo: "parent",
axis: false,
cancel: ":input,option",
Modified: trunk/tests/unit/draggable/draggable_options.js
==============================================================================
--- trunk/tests/unit/draggable/draggable_options.js (original)
+++ trunk/tests/unit/draggable/draggable_options.js Sun Feb 1 22:45:50 2009
@@ -23,6 +23,18 @@
module("draggable: options");
+test("{ addClasses: true }, default", function() {
+ equals(draggable_defaults.addClasses, true);
+
+ el = $("<div></div>").draggable({ addClasses: true });
+ ok(el.is(".ui-draggable"), "'ui-draggable' class added");
+});
+
+test("{ addClasses: false }", function() {
+ el = $("<div></div>").draggable({ addClasses: false });
+ ok(!el.is(".ui.draggable"), "'ui-draggable' class not added");
+});
+
test("{ appendTo: 'parent' }, default", function() {
equals(draggable_defaults.appendTo, "parent");
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Sun Feb 1 22:45:50 2009
@@ -19,8 +19,8 @@
if (this.options.helper == 'original' && !(/^(?:r|a|
f)/).test(this.element.css("position")))
this.element[0].style.position = 'relative';
- (this.options.cssNamespace &&
this.element.addClass(this.options.cssNamespace+"-draggable"));
- (this.options.disabled &&
this.element.addClass(this.options.cssNamespace+'-draggable-disabled'));
+ (this.options.addClasses && this.element.addClass("ui-draggable"));
+ (this.options.disabled &&
this.element.addClass("ui-draggable-disabled"));
this._mouseInit();
@@ -28,7 +28,12 @@
destroy: function() {
if(!this.element.data('draggable')) return;
-
this.element.removeData("draggable").unbind(".draggable").removeClass(this.options.cssNamespace+'-draggable '+this.options.cssNamespace+'-draggable-dragging '+this.options.cssNamespace+'-draggable-disabled');
+ this.element
+ .removeData("draggable")
+ .unbind(".draggable")
+ .removeClass("ui-draggable"
+ + " ui-draggable-dragging"
+ + " ui-draggable-disabled");
this._mouseDestroy();
},
@@ -36,7 +41,7 @@
var o = this.options;
- if (this.helper || o.disabled ||
$(event.target).is('.'+this.options.cssNamespace+'-resizable-handle'))
+ if (this.helper || o.disabled ||
$(event.target).is('.ui-resizable-handle'))
return false;
//Quit if we're not on a valid handle
@@ -113,7 +118,7 @@
if ($.ui.ddmanager && !o.dropBehaviour)
$.ui.ddmanager.prepareOffsets(this, event);
- this.helper.addClass(o.cssNamespace+"-draggable-dragging");
+ this.helper.addClass("ui-draggable-dragging");
this._mouseDrag(event, true); //Execute the drag once - this causes the
helper not to be visible before getting its correct position
return true;
},
@@ -365,7 +370,7 @@
},
_clear: function() {
- this.helper.removeClass(this.options.cssNamespace+"-draggable-dragging");
+ this.helper.removeClass("ui-draggable-dragging");
if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval)
this.helper.remove();
//if($.ui.ddmanager) $.ui.ddmanager.current = null;
this.helper = null;
@@ -398,12 +403,12 @@
version: "@VERSION",
eventPrefix: "drag",
defaults: {
+ addClasses: true,
appendTo: "parent",
axis: false,
cancel: ":input,option",
connectToSortable: false,
containment: false,
- cssNamespace: "ui",
cursor: "auto",
cursorAt: false,
delay: 0,