Skip to content

Commit 4cdbcd4

Browse files
committed
Sortable: Add classes option
1 parent fe246fb commit 4cdbcd4

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

tests/unit/sortable/sortable_common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TestHelpers.commonWidgetTests( "sortable", {
33
appendTo: "parent",
44
axis: false,
55
cancel: "input,textarea,button,select,option",
6+
classes: {},
67
connectWith: false,
78
containment: false,
89
cursor: "auto",

ui/sortable.js

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
3737
options: {
3838
appendTo: "parent",
3939
axis: false,
40+
classes: {},
4041
connectWith: false,
4142
containment: false,
4243
cursor: "auto",
@@ -83,7 +84,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
8384

8485
_create: function() {
8586
this.containerCache = {};
86-
this.element.addClass("ui-sortable");
87+
this._addClass( "ui-sortable" );
8788

8889
//Get the items
8990
this.refresh();
@@ -110,19 +111,19 @@ return $.widget("ui.sortable", $.ui.mouse, {
110111
},
111112

112113
_setHandleClassName: function() {
113-
this.element.find( ".ui-sortable-handle" ).removeClass( "ui-sortable-handle" );
114+
var that = this;
115+
this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" );
114116
$.each( this.items, function() {
115-
( this.instance.options.handle ?
116-
this.item.find( this.instance.options.handle ) : this.item )
117-
.addClass( "ui-sortable-handle" );
117+
that._addClass(
118+
this.instance.options.handle ?
119+
this.item.find( this.instance.options.handle ) :
120+
this.item,
121+
"ui-sortable-handle"
122+
);
118123
});
119124
},
120125

121126
_destroy: function() {
122-
this.element
123-
.removeClass( "ui-sortable ui-sortable-disabled" )
124-
.find( ".ui-sortable-handle" )
125-
.removeClass( "ui-sortable-handle" );
126127
this._mouseDestroy();
127128

128129
for ( var i = this.items.length - 1; i >= 0; i-- ) {
@@ -307,7 +308,7 @@ return $.widget("ui.sortable", $.ui.mouse, {
307308

308309
this.dragging = true;
309310

310-
this.helper.addClass("ui-sortable-helper");
311+
this._addClass( this.helper, "ui-sortable-helper" );
311312
this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
312313
return true;
313314

@@ -476,7 +477,8 @@ return $.widget("ui.sortable", $.ui.mouse, {
476477
this._mouseUp({ target: null });
477478

478479
if(this.options.helper === "original") {
479-
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
480+
this.currentItem.css(this._storedCSS);
481+
this._removeClass( this.currentItem, "ui-sortable-helper" );
480482
} else {
481483
this.currentItem.show();
482484
}
@@ -789,9 +791,11 @@ return $.widget("ui.sortable", $.ui.mouse, {
789791
element: function() {
790792

791793
var nodeName = that.currentItem[0].nodeName.toLowerCase(),
792-
element = $( "<" + nodeName + ">", that.document[0] )
793-
.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
794-
.removeClass("ui-sortable-helper");
794+
element = $( "<" + nodeName + ">", that.document[0] );
795+
796+
that._addClass( element, className || that.currentItem[0].className +
797+
" ui-sortable-placeholder" )
798+
._removeClass( element, "ui-sortable-helper" );
795799

796800
if ( nodeName === "tr" ) {
797801
that.currentItem.children().each(function() {
@@ -1206,7 +1210,8 @@ return $.widget("ui.sortable", $.ui.mouse, {
12061210
this._storedCSS[i] = "";
12071211
}
12081212
}
1209-
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
1213+
this.currentItem.css( this._storedCSS );
1214+
this._removeClass( this.currentItem, "ui-sortable-helper" );
12101215
} else {
12111216
this.currentItem.show();
12121217
}

0 commit comments

Comments
 (0)