deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
jeresig 2010-01-06 11:32:39 -05:00
commit e424e01c47
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core.js
View file

@ -316,10 +316,10 @@ jQuery.extend = jQuery.fn.extend = function() {
continue;
}
// Recurse if we're merging object literal values
if ( deep && copy && jQuery.isPlainObject(copy) ) {
// Don't extend not object literals
var clone = src && jQuery.isPlainObject(src) ? src : {};
// Recurse if we're merging object literal values or arrays
if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
: jQuery.isArray(copy) ? [] : {};
// Never move original objects, clone them
target[ name ] = jQuery.extend( deep, clone, copy );