From a28fbe52221db322efc0bab0c86762b91622ba5c Mon Sep 17 00:00:00 2001 From: minggo Date: Mon, 18 Jul 2016 16:55:56 +0800 Subject: [PATCH] fix wrong behavior of 'cc.isObject' function for undefined and null --- native/cocos/scripting/js-bindings/script/jsb_prepare.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/native/cocos/scripting/js-bindings/script/jsb_prepare.js b/native/cocos/scripting/js-bindings/script/jsb_prepare.js index cb66ef2715..0ecb12d9ba 100644 --- a/native/cocos/scripting/js-bindings/script/jsb_prepare.js +++ b/native/cocos/scripting/js-bindings/script/jsb_prepare.js @@ -132,8 +132,7 @@ cc.isValidValue = function(obj) { * @returns {boolean} */ cc.isObject = function(obj) { - return (obj && obj.__nativeObj !== undefined) || - ( typeof obj === "object" && Object.prototype.toString.call(obj) === '[object Object]' ); + return ( obj !== null && typeof obj === "object" ); }; /**