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: Handle Object.create(null) for options objects

Browse Source 
Fixes #15179
Closes gh-1809
This commit is contained in:
Scott González 2017-04-21 14:49:52 -04:00
parent ef2e9bab92
commit b3c0a7f71d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/widget/extend.js
View File

@ -5,7 +5,7 @@ define( [
], function( QUnit, $ ) {
QUnit.test( "$.widget.extend()", function( assert ) {
assert.expect( 27 );
assert.expect( 28 );
var ret, empty, optionsWithLength, optionsWithDate, myKlass, customObject, optionsWithCustomObject, nullUndef,
target, recursive, obj, input, output,
@ -108,6 +108,11 @@ QUnit.test( "$.widget.extend()", function( assert ) {
assert.deepEqual( input, output, "don't clone arrays" );
input.key[ 0 ] = 10;
assert.deepEqual( input, output, "don't clone arrays" );
input = Object.create( null );
input.foo = "f";
output = $.widget.extend( {}, input );
assert.deepEqual( input, output, "Object with no prototype" );
} );
} );

3
ui/widget.js
View File

@ -26,6 +26,7 @@
}( function( $ ) {
var widgetUuid = 0;
var widgetHasOwnProperty = Array.prototype.hasOwnProperty;
var widgetSlice = Array.prototype.slice;
$.cleanData = ( function( orig ) {
@ -183,7 +184,7 @@ $.widget.extend = function( target ) {
for ( ; inputIndex < inputLength; inputIndex++ ) {
for ( key in input[ inputIndex ] ) {
value = input[ inputIndex ][ key ];
if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
if ( widgetHasOwnProperty.call( input[ inputIndex ], key ) && value !== undefined ) {
// Clone objects
if ( $.isPlainObject( value ) ) {