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

Widget: $.widget.extend(): Properly handle extending a string with an object. Fixes #8713 - Passing an object as ui.resizable handles parameter does not work.

Browse Source
This commit is contained in:
Scott González 2012-10-22 15:33:57 -04:00
parent 6bedc0af35
commit 9b908878ae
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/widget/widget_extend.js
View File

@ -1,5 +1,5 @@
test( "$.widget.extend()", function() {
expect( 26 );
expect( 27 );
var ret, empty, optionsWithLength, optionsWithDate, myKlass, customObject, optionsWithCustomObject, nullUndef,
target, recursive, obj, input, output,
@ -76,13 +76,16 @@ test( "$.widget.extend()", function() {
ret = $.widget.extend( { foo: [] }, { foo: [0] } ); // 1907
equal( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
ret = $.widget.extend( { foo: "1,2,3" }, { foo: [1, 2, 3] } );
strictEqual( typeof ret.foo, "object", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
ret = $.widget.extend( { foo: "1,2,3" }, { foo: [ 1, 2, 3 ] } );
deepEqual( ret.foo, [ 1, 2, 3 ], "Properly extend a string to array." );
ret = $.widget.extend( { foo: "1,2,3" }, { foo: { to: "object" } } );
deepEqual( ret.foo, { to: "object" }, "Properly extend a string to object." );
ret = $.widget.extend( { foo: "bar" }, { foo: null } );
strictEqual( typeof ret.foo, "object", "Make sure a null value doesn't crash with deep extend, for #1908" );
strictEqual( ret.foo, null, "Make sure a null value doesn't crash with deep extend, for #1908" );
obj = { foo:null };
obj = { foo: null };
$.widget.extend( obj, { foo:"notnull" } );
equal( obj.foo, "notnull", "Make sure a null value can be overwritten" );

6
ui/jquery.ui.widget.js vendored
View File

@ -143,7 +143,11 @@ $.widget.extend = function( target ) {
for ( key in input[ inputIndex ] ) {
value = input[ inputIndex ][ key ];
if (input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
target[ key ] = $.isPlainObject( value ) ? $.widget.extend( {}, target[ key ], value ) : value;
if ( $.isPlainObject( value ) && $.isPlainObject( target[ key ] ) ) {
target[ key ] = $.widget.extend( {}, target[ key ], value );
} else {
target[ key ] = value;
}
}
}
}