Skip to content
Permalink
Browse files

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

  • Loading branch information
jeresig committed Jan 6, 2010
2 parents e9d5947 + 0d1a2c1 commit e424e01c47084f29d83a643cc5540fd37b85c68d
Showing with 11 additions and 6 deletions.
  1. +4 −4 src/core.js
  2. +7 −2 test/unit/core.js
@@ -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 );
@@ -643,7 +643,7 @@ test("jQuery.merge()", function() {
});

test("jQuery.extend(Object, Object)", function() {
expect(25);
expect(27);

var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -653,7 +653,9 @@ test("jQuery.extend(Object, Object)", function() {
deep1copy = { foo: { bar: true } },
deep2 = { foo: { baz: true }, foo2: document },
deep2copy = { foo: { baz: true }, foo2: document },
deepmerged = { foo: { bar: true, baz: true }, foo2: document };
deepmerged = { foo: { bar: true, baz: true }, foo2: document },
arr = [1, 2, 3],
nestedarray = { arr: arr };

jQuery.extend(settings, options);
same( settings, merged, "Check if extended: settings must be extended" );
@@ -668,6 +670,9 @@ test("jQuery.extend(Object, Object)", function() {
same( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );

ok( jQuery.extend(true, [], arr) !== arr, "Deep extend of array must clone array" );
ok( jQuery.extend(true, {}, nestedarray).arr !== arr, "Deep extend of object must clone child array" );

var empty = {};
var optionsWithLength = { foo: { length: -1 } };
jQuery.extend(true, empty, optionsWithLength);

0 comments on commit e424e01

Please sign in to comment.
You can’t perform that action at this time.