From 37902e86b158eaa90f44d0932063d22df3050326 Mon Sep 17 00:00:00 2001 From: David Serduke Date: Fri, 30 Nov 2007 08:39:49 +0000 Subject: [PATCH 1/1] Fixed a problem with changeset [3841] where a function could no longer be .extend()-ed. --- src/core.js | 2 +- test/unit/core.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/core.js b/src/core.js index 0bf3530..bd6d929 100644 --- a/src/core.js +++ b/src/core.js @@ -530,7 +530,7 @@ jQuery.extend = jQuery.fn.extend = function() { } // Handle case when target is a string or something (possible in deep copy) - if ( typeof target != "object" ) + if ( typeof target != "object" && typeof target != "function" ) target = {}; // extend jQuery itself if only one argument is passed diff --git a/test/unit/core.js b/test/unit/core.js index ce70be6..a1ebb1b 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -837,7 +837,7 @@ test("is(String)", function() { }); test("$.extend(Object, Object)", function() { - expect(15); + expect(17); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -876,6 +876,14 @@ test("$.extend(Object, Object)", function() { var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } ); ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" ); + var obj = { foo:null }; + jQuery.extend(true, obj, { foo:"notnull" } ); + equals( obj.foo, "notnull", "Make sure a null value can be overwritten" ); + + function func() {} + jQuery.extend(func, { key: "value" } ); + equals( func.key, "value", "Verify a function can be extended" ); + var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options1 = { xnumber2: 1, xstring2: "x" }, -- 1.7.10.4