Fixed a problem with changeset [3841] where a function could no longer be .extend...

diff --git a/src/core.js b/src/core.js
index 0bf353074edc2f6c262ce85fc8042474591cef00..bd6d929d5a4277dc96690efbb19a1b6a75de56b6 100644 (file)
--- 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 ce70be6887efd92379be6e5cc927a8367c3ce7b8..a1ebb1ba428d111a38e93a5e7576c98f7d4c00ea 100644 (file)
--- 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" },