Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12630 from pandamicro/v3.7-release 

Fix cc.isArray for JSB
This commit is contained in:
pandamicro 2015-07-01 21:59:04 +08:00
parent 8fa43089f3 3b9fd5502e
commit bebce270a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/script/jsb_boot.js
View File

@ -102,7 +102,7 @@ cc.isString = function(obj) {
*/
cc.isArray = function(obj) {
return Array.isArray(obj) ||
(typeof obj === 'object' && objectToString(obj) === '[object Array]');
(typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Array]');
};
/**

2
web

@ -1 +1 @@
Subproject commit 7bda47bea51d63a649152930c246e366ed48f665
Subproject commit 8048837e508ad8f7f2b36ab8426ed32e36996cb3