Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resizable: Keep user defined handles on _setOption
Fixes #15084
Closes gh-1795
  • Loading branch information
kdinev authored and scottgonzalez committed Feb 24, 2017
1 parent a3b9129 commit 278d1e1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
28 changes: 20 additions & 8 deletions tests/unit/resizable/options.js
Expand Up @@ -434,11 +434,20 @@ QUnit.test( "zIndex, applied to all handles", function( assert ) {
} );

QUnit.test( "setOption handles", function( assert ) {
assert.expect( 11 );

var target = $( "<div></div>" ).resizable();

function checkHandles( expectedHandles ) {
assert.expect( 15 );

var target = $( "<div></div>" ).resizable(),
target2 = $( "<div>" +
"<div class='ui-resizable-handle ui-resizable-e'></div>" +
"<div class='ui-resizable-handle ui-resizable-w'></div>" +
"</div>" ).resizable( {
handles: {
"e": "ui-resizable-e",
"w": "ui-resizable-w"
}
} );

function checkHandles( target, expectedHandles ) {
expectedHandles = $.map( expectedHandles, function( value ) {
return ".ui-resizable-" + value;
} );
Expand All @@ -451,13 +460,16 @@ QUnit.test( "setOption handles", function( assert ) {
} );
}

checkHandles( [ "e", "s", "se" ] );
checkHandles( target, [ "e", "s", "se" ] );

target.resizable( "option", "handles", "n, w, nw" );
checkHandles( [ "n", "w", "nw" ] );
checkHandles( target, [ "n", "w", "nw" ] );

target.resizable( "option", "handles", "s, w" );
checkHandles( [ "s", "w" ] );
checkHandles( target, [ "s", "w" ] );

target2.resizable( "option", "handles", "e, s, w" );
checkHandles( target2, [ "e", "s", "w" ] );
} );

QUnit.test( "alsoResize + containment", function( assert ) {
Expand Down
8 changes: 6 additions & 2 deletions ui/widgets/resizable.js
Expand Up @@ -250,6 +250,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
} );

this._handles = $();
this._addedHandles = $();
if ( this.handles.constructor === String ) {

if ( this.handles === "all" ) {
Expand All @@ -269,7 +270,10 @@ $.widget( "ui.resizable", $.ui.mouse, {
axis.css( { zIndex: o.zIndex } );

this.handles[ handle ] = ".ui-resizable-" + handle;
this.element.append( axis );
if ( !this.element.children( this.handles[ handle ] ).length ) {
this.element.append( axis );
this._addedHandles = this._addedHandles.add( axis );
}
}

}
Expand Down Expand Up @@ -335,7 +339,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
},

_removeHandles: function() {
this._handles.remove();
this._addedHandles.remove();
},

_mouseCapture: function( event ) {
Expand Down

0 comments on commit 278d1e1

Please sign in to comment.