github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects 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
parent e9d5947b4a 0d1a2c1b11
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 );