Skip to content

Commit

Permalink
Resizable: Keep user-provided handles on destroy
Browse files Browse the repository at this point in the history
Closes gh-1798
Ref gh-1795
  • Loading branch information
kdinev authored and scottgonzalez committed Apr 17, 2017
1 parent c6e2b52 commit c426b9a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
10 changes: 9 additions & 1 deletion tests/unit/resizable/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,10 @@ QUnit.test( "zIndex, applied to all handles", function( assert ) {
} );

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

// https://bugs.jqueryui.com/ticket/3423
// https://bugs.jqueryui.com/ticket/15084
var target = $( "<div></div>" ).resizable(),
target2 = $( "<div>" +
"<div class='ui-resizable-handle ui-resizable-e'></div>" +
Expand Down Expand Up @@ -470,6 +472,12 @@ QUnit.test( "setOption handles", function( assert ) {

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

target.resizable( "destroy" );
checkHandles( target, [ ] );

target2.resizable( "destroy" );
checkHandles( target2, [ "e", "w" ] );
} );

QUnit.test( "alsoResize + containment", function( assert ) {
Expand Down
5 changes: 2 additions & 3 deletions ui/widgets/resizable.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,14 @@ $.widget( "ui.resizable", $.ui.mouse, {
_destroy: function() {

this._mouseDestroy();
this._addedHandles.remove();

var wrapper,
_destroy = function( exp ) {
$( exp )
.removeData( "resizable" )
.removeData( "ui-resizable" )
.off( ".resizable" )
.find( ".ui-resizable-handle" )
.remove();
.off( ".resizable" );
};

// TODO: Unwrap at same DOM position
Expand Down

0 comments on commit c426b9a

Please sign in to comment.