From 3b9fd5502ef4d714e3bbb5dcf02277505204e197 Mon Sep 17 00:00:00 2001
From: pandamicro <lphuabin@gmail.com>
Date: Wed, 1 Jul 2015 21:57:39 +0800
Subject: [PATCH] Fix cc.isArray for JSB

---
 cocos/scripting/js-bindings/script/jsb_boot.js | 2 +-
 web                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cocos/scripting/js-bindings/script/jsb_boot.js b/cocos/scripting/js-bindings/script/jsb_boot.js
index 3d075775f9..09b4123a9c 100644
--- a/cocos/scripting/js-bindings/script/jsb_boot.js
+++ b/cocos/scripting/js-bindings/script/jsb_boot.js
@@ -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]');
 };
 
 /**
diff --git a/web b/web
index 7bda47bea5..8048837e50 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit 7bda47bea51d63a649152930c246e366ed48f665
+Subproject commit 8048837e508ad8f7f2b36ab8426ed32e36996cb3