Draggable: Add classes option

arschmitz · arschmitz · commit 3350e6c1832b · 2015-01-01T16:39:33.000-05:00
diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js
@@ -3,6 +3,7 @@ TestHelpers.commonWidgetTests( "draggable", {
 		appendTo: "parent",
 		axis: false,
 		cancel: "input,textarea,button,select,option",
+		classes: {},
 		connectToSortable: false,
 		containment: false,
 		cursor: "auto",
diff --git a/ui/draggable.js b/ui/draggable.js
@@ -32,6 +32,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		addClasses: true,
 		appendTo: "parent",
 		axis: false,
+		classes: {},
 		connectToSortable: false,
 		containment: false,
 		cursor: "auto",
@@ -65,10 +66,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this._setPositionRelative();
 		}
 		if (this.options.addClasses){
-			this.element.addClass("ui-draggable");
+			this._addClass( "ui-draggable" );
 		}
 		if (this.options.disabled){
-			this.element.addClass("ui-draggable-disabled");
+			this._addClass( "ui-draggable-disabled" );
 		}
 		this._setHandleClassName();
 
@@ -88,7 +89,6 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this.destroyOnClear = true;
 			return;
 		}
-		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
 		this._removeHandleClassName();
 		this._mouseDestroy();
 	},
@@ -164,7 +164,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		//Create and append the visible helper
 		this.helper = this._createHelper(event);
 
-		this.helper.addClass("ui-draggable-dragging");
+		this._addClass( this.helper, "ui-draggable-dragging" );
 
 		//Cache the helper size
 		this._cacheHelperProportions();
@@ -346,11 +346,11 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_setHandleClassName: function() {
 		this.handleElement = this.options.handle ?
 			this.element.find( this.options.handle ) : this.element;
-		this.handleElement.addClass( "ui-draggable-handle" );
+		this._addClass( this.handleElement, "ui-draggable-handle" );
 	},
 
 	_removeHandleClassName: function() {
-		this.handleElement.removeClass( "ui-draggable-handle" );
+		this._removeClass( this.handleElement, "ui-draggable-handle" );
 	},
 
 	_createHelper: function(event) {
@@ -654,7 +654,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
+		this._removeClass( this.helper, "ui-draggable-dragging" );
 		if (this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
 			this.helper.remove();
 		}
