Made isObjectLiteral to work correctly with custom objects with empty prototypes.

diff --git a/src/core.js b/src/core.js
index 611e5363bba0e2530ce70e0726dc33339f505f67..1d5a25bd5dab645bc45c410ced0450df1c249a5e 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -328,13 +328,20 @@ jQuery.extend({
                        return false;
                }
                
+               // not own constructor property must be Object
+               if ( obj.constructor
+                 && !hasOwnProperty.call(obj, "constructor")
+                 && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+                       return false;
+               }
+               
                //own properties are iterated firstly,
                //so to speed up, we can test last one if it is own or not
-               
+       
                var key;
                for ( key in obj ) {}
                
-               return !key || hasOwnProperty.call( obj, key );
+               return key === undefined || hasOwnProperty.call( obj, key );
        },
 
        isEmptyObject: function( obj ) {

diff --git a/test/unit/core.js b/test/unit/core.js
index 6bac6309c671cb5afe989daa614bc2913f645156..b355a8c40f35091ac449767443d3580e87555e27 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -553,10 +553,14 @@ test("jQuery.extend(Object, Object)", function() {
        same( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
 
        var myKlass = function() {};
+       var optionsWithCustomObject = { foo: { date: new myKlass } };
+       empty = {};
+       jQuery.extend(true, empty, optionsWithCustomObject);
+       same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly (no methods)" );
+       
        // Makes the class a little more realistic
        myKlass.prototype = { someMethod: function(){} };
        empty = {};
-       var optionsWithCustomObject = { foo: { date: new myKlass } };
        jQuery.extend(true, empty, optionsWithCustomObject);
        same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" );