Permalink
Browse files

Core: Simplify isPlainObject

Fixes gh-2986
Close gh-2998
  • Loading branch information...
1 parent 10fc590 commit e0d3bfa77073a245ca112736a1ed3db07d5adcf6 @gibson042 gibson042 committed with Timmy Willison Mar 14, 2016
Showing with 37 additions and 23 deletions.
  1. +18 −18 src/core.js
  2. +5 −0 src/var/ObjectFunctionString.js
  3. +5 −0 src/var/fnToString.js
  4. +3 −0 src/var/getProto.js
  5. +6 −5 test/unit/core.js
View
@@ -1,17 +1,21 @@
define( [
"./var/arr",
"./var/document",
+ "./var/getProto",
"./var/slice",
"./var/concat",
"./var/push",
"./var/indexOf",
"./var/class2type",
"./var/toString",
"./var/hasOwn",
+ "./var/fnToString",
+ "./var/ObjectFunctionString",
"./var/support",
"./core/DOMEval"
-], function( arr, document, slice, concat,
- push, indexOf, class2type, toString, hasOwn, support, DOMEval ) {
+], function( arr, document, getProto, slice, concat, push, indexOf,
+ class2type, toString, hasOwn, fnToString, ObjectFunctionString,
+ support, DOMEval ) {
var
version = "@VERSION",
@@ -225,28 +229,24 @@ jQuery.extend( {
},
isPlainObject: function( obj ) {
- var key;
+ var proto, Ctor;
- // Not plain objects:
- // - Any object or value whose internal [[Class]] property is not "[object Object]"
- // - DOM nodes
- // - window
- if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+ // Detect obvious negatives
+ // Use toString instead of jQuery.type to catch host objects
+ if ( !obj || toString.call( obj ) !== "[object Object]" ) {
return false;
}
- // Not own constructor property must be Object
- if ( obj.constructor &&
- !hasOwn.call( obj, "constructor" ) &&
- !hasOwn.call( obj.constructor.prototype || {}, "isPrototypeOf" ) ) {
- return false;
- }
+ proto = getProto( obj );
- // Own properties are enumerated firstly, so to speed up,
- // if last one is own, then all properties are own
- for ( key in obj ) {}
+ // Objects with no prototype (e.g., `Object.create( null )`) are plain
+ if ( !proto ) {
+ return true;
+ }
- return key === undefined || hasOwn.call( obj, key );
+ // Objects with prototype are plain iff they were constructed by a global Object function
+ Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
+ return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
},
isEmptyObject: function( obj ) {
@@ -0,0 +1,5 @@
+define( [
+ "./fnToString"
+], function( fnToString ) {
+ return fnToString.call( Object );
+} );
@@ -0,0 +1,5 @@
+define( [
+ "./hasOwn"
+], function( hasOwn ) {
+ return hasOwn.toString;
+} );
View
@@ -0,0 +1,3 @@
+define( function() {
+ return Object.getPrototypeOf;
+} );
View
@@ -287,7 +287,7 @@ QUnit.test( "type for `Symbol`", function( assert ) {
QUnit.asyncTest( "isPlainObject", function( assert ) {
- assert.expect( 22 );
+ assert.expect( 23 );
var pass, iframe, doc, parentObj, childObj, deep,
fn = function() {};
@@ -300,12 +300,13 @@ QUnit.asyncTest( "isPlainObject", function( assert ) {
assert.ok( jQuery.isPlainObject( { constructor: "foo" } ),
"plain object with primitive constructor property" );
- parentObj = { foo: "bar" };
+ parentObj = {};
childObj = Object.create( parentObj );
-
- assert.ok( !jQuery.isPlainObject( childObj ), "isPlainObject(Object.create({}))" );
+ assert.ok( !jQuery.isPlainObject( childObj ), "Object.create({})" );
+ parentObj.foo = "bar";
+ assert.ok( !jQuery.isPlainObject( childObj ), "Object.create({...})" );
childObj.bar = "foo";
- assert.ok( !jQuery.isPlainObject( childObj ), "isPlainObject(Object.create({}))" );
+ assert.ok( !jQuery.isPlainObject( childObj ), "extend(Object.create({...}), ...)" );
// Not objects shouldn't be matched
assert.ok( !jQuery.isPlainObject( "" ), "string" );

0 comments on commit e0d3bfa

Please sign in to comment.