Made isPlainObject() supporting null, undefined, and window values on IE too. Also...

diff --git a/src/core.js b/src/core.js
index 1edf98edcaceeb5c80c68d4c69a643628fea3404..bc48e5d47dc3dd95b9cdecf706d5e2030c6ec4bd 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -425,19 +425,21 @@ jQuery.extend({
        },
 
        isPlainObject: function( obj ) {
-               if ( toString.call(obj) !== "[object Object]" || typeof obj.nodeType === "number" ) {
+               // Must be an Object.
+               // Because of IE, we also have to check the presence of the constructor property.
+               if ( !obj || toString.call(obj) !== "[object Object]" || !("constructor" in obj) ) {
                        return false;
                }
                
-               // not own constructor property must be Object
+               // 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
+               // Own properties are enumerated firstly, so to speed up,
+               // if last one is own, then all properties are own.
        
                var key;
                for ( key in obj ) {}

diff --git a/test/unit/core.js b/test/unit/core.js
index 185f77aa3b87783be996b672e474067387553846..1e03c96c0e51606cd0b2e9c8d760080c7d422ec3 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -204,12 +204,22 @@ test("trim", function() {
 });
 
 test("isPlainObject", function() {
-       expect(7);
+       expect(14);
 
        stop();
 
        // The use case that we want to match
        ok(jQuery.isPlainObject({}), "{}");
+       
+       // Not objects shouldn't be matched
+       ok(!jQuery.isPlainObject(""), "string");
+       ok(!jQuery.isPlainObject(0) && !jQuery.isPlainObject(1), "number");
+       ok(!jQuery.isPlainObject(true) && !jQuery.isPlainObject(false), "boolean");
+       ok(!jQuery.isPlainObject(null), "null");
+       ok(!jQuery.isPlainObject(undefined), "undefined");
+       
+       // Arrays shouldn't be matched
+       ok(!jQuery.isPlainObject([]), "array");
  
        // Instantiated objects shouldn't be matched
        ok(!jQuery.isPlainObject(new Date), "new Date");
@@ -231,6 +241,9 @@ test("isPlainObject", function() {
 
        // DOM Element
        ok(!jQuery.isPlainObject(document.createElement("div")), "DOM Element");
+       
+       // Window
+       ok(!jQuery.isPlainObject(window), "window");
  
        var iframe = document.createElement("iframe");
        document.body.appendChild(iframe);