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

Resizable: Keep user defined handles on _setOption

Browse Source 
Fixes #15084
Closes gh-1795
This commit is contained in:
Konstantin Dinev 2017-02-24 17:36:19 +02:00 committed by Scott González
parent a3b9129be1
commit 278d1e1108
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/unit/resizable/options.js
View File

@ -434,11 +434,20 @@ QUnit.test( "zIndex, applied to all handles", function( assert ) {
} ); } );
QUnit.test( "setOption handles", function( assert ) { QUnit.test( "setOption handles", function( assert ) {
assert.expect( 11 ); assert.expect( 15 );
var target = $( "<div></div>" ).resizable(); 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( expectedHandles ) { function checkHandles( target, expectedHandles ) {
expectedHandles = $.map( expectedHandles, function( value ) { expectedHandles = $.map( expectedHandles, function( value ) {
return ".ui-resizable-" + value; return ".ui-resizable-" + value;
} ); } );
@ -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" ); target.resizable( "option", "handles", "n, w, nw" );
checkHandles( [ "n", "w", "nw" ] ); checkHandles( target, [ "n", "w", "nw" ] );
target.resizable( "option", "handles", "s, w" ); 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 ) { QUnit.test( "alsoResize + containment", function( assert ) {

8
ui/widgets/resizable.js
View File

@ -250,6 +250,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
} ); } );
this._handles = $(); this._handles = $();
this._addedHandles = $();
if ( this.handles.constructor === String ) { if ( this.handles.constructor === String ) {
if ( this.handles === "all" ) { if ( this.handles === "all" ) {
@ -269,7 +270,10 @@ $.widget( "ui.resizable", $.ui.mouse, {
axis.css( { zIndex: o.zIndex } ); axis.css( { zIndex: o.zIndex } );
this.handles[ handle ] = ".ui-resizable-" + handle; 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 );
}
} }
} }
@ -335,7 +339,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
}, },
_removeHandles: function() { _removeHandles: function() {
this._handles.remove(); this._addedHandles.remove();
}, },
_mouseCapture: function( event ) { _mouseCapture: function( event ) {