library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Draggable: Manage ui-draggable-handle correctly in nested instances

Browse Source
This commit is contained in:
TJ VanToll 2014-07-15 15:16:26 -04:00
parent 7594a31425
commit 3ca32b2ad8
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/draggable/draggable_core.js
View File

@ -291,4 +291,17 @@ test( "ui-draggable-handle assigned to appropriate element", function() {
ok( !element.find( "p" ).hasClass( "ui-draggable-handle" ), "removed in destroy()" );
});
test( "ui-draggable-handle managed correctly in nested draggables", function() {
expect( 4 );
var parent = $( "<div><div></div></div>" ).draggable().appendTo( "#qunit-fixture" ),
child = parent.find( "div" ).draggable();
ok( parent.hasClass( "ui-draggable-handle" ), "parent has class name on init" );
ok( child.hasClass( "ui-draggable-handle" ), "child has class name on init" );
parent.draggable( "destroy" );
ok( !parent.hasClass( "ui-draggable-handle" ), "parent loses class name on destroy" );
ok( child.hasClass( "ui-draggable-handle" ), "child retains class name on destroy" );
});
})( jQuery );

10
ui/draggable.js
View File

@ -78,6 +78,7 @@ $.widget("ui.draggable", $.ui.mouse, {
_setOption: function( key, value ) {
this._super( key, value );
if ( key === "handle" ) {
this._removeHandleClassName();
this._setHandleClassName();
}
},
@ -314,16 +315,13 @@ $.widget("ui.draggable", $.ui.mouse, {
},
_setHandleClassName: function() {
var handle = this.options.handle ?
this.handleElement = this.options.handle ?
this.element.find( this.options.handle ) : this.element;
this._removeHandleClassName();
handle.addClass( "ui-draggable-handle" );
this.handleElement.addClass( "ui-draggable-handle" );
},
_removeHandleClassName: function() {
this.element.find( ".ui-draggable-handle" )
.addBack()
.removeClass( "ui-draggable-handle" );
this.handleElement.removeClass( "ui-draggable-handle" );
},
_createHelper: function(event) {