diff --git a/tests/js-tests/src/EventTest/EventTest.js b/tests/js-tests/src/EventTest/EventTest.js
index edaa70efcf..c6bdaaceec 100644
--- a/tests/js-tests/src/EventTest/EventTest.js
+++ b/tests/js-tests/src/EventTest/EventTest.js
@@ -253,8 +253,11 @@ var TouchAllAtOnce = EventTest.extend({
             var touch = touches[i];
             var pos = touch.getLocation();
             var id = touch.getID();
-            var force = touch.getCurrentForce();
-            var maxForce = touch.getMaxForce();
+            var force = 0, maxForce = 0;
+            if (touch.getCurrentForce) {
+                force = touch.getCurrentForce();
+                maxForce = touch.getMaxForce();
+            }
             cc.log("Touch #" + i + ". onTouchesMoved at: " + pos.x + " " + pos.y + " Id:" + id + " current force:" + force + " maximum postible force:" + maxForce);
             target.update_id(id, pos);
         }
diff --git a/tests/js-tests/src/SceneTest/SceneTest.js b/tests/js-tests/src/SceneTest/SceneTest.js
index 30367e8721..820b3f5a2e 100644
--- a/tests/js-tests/src/SceneTest/SceneTest.js
+++ b/tests/js-tests/src/SceneTest/SceneTest.js
@@ -41,7 +41,7 @@ var SceneTestLayer1 = cc.Layer.extend({
         var item1 = new cc.MenuItemFont("Test pushScene", this.onPushScene, this);
         var item2 = new cc.MenuItemFont("Test pushScene w/transition", this.onPushSceneTran, this);
         var item3 = new cc.MenuItemFont("Quit", function () {
-            cc.log("quit!")
+            cc.log("quit!");
         }, this);
         var item4 = new cc.MenuItemFont("setNotificationNode", function () {
             var layerTemp = new cc.LayerColor(cc.color(0, 255, 255, 120));
@@ -105,6 +105,7 @@ var SceneTestLayer1 = cc.Layer.extend({
     },
     onExit:function (sender) {
         cc.director.setNotificationNode(null);
+        this._super();
     }
 
     //CREATE_NODE(SceneTestLayer1);
diff --git a/web b/web
index d176dc4f74..29e12e52e4 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit d176dc4f74396746445112d030c2fa63875e5bf8
+Subproject commit 29e12e52e4d8f47aa5a256967613b353fbbb424d