From ecea0f4951c243a9ea4b2b430f4d0ec9fa8f0170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=90=E9=BE=99=E5=B1=B1=E4=BA=BA?= Date: Thu, 6 Jul 2017 10:27:52 +0800 Subject: [PATCH] update web engine submodule, improve editbox tests (#18032) --- tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js | 5 ++++- web | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js b/tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js index e50ecc5f87..eacd76fdad 100644 --- a/tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js +++ b/tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js @@ -62,16 +62,19 @@ var EditBoxTestLayer = cc.Layer.extend({ this._box3.y = 250; this._box3.setFontColor(cc.color(15, 250, 245)); this._box3.setDelegate(this); + this._box3.setTouchEnabled(false); + this._box3.setTouchEnabled(true); this.addChild(this._box3); this._box4 = new cc.EditBox(cc.size(180, 50), new cc.Scale9Sprite("extensions/yellow_edit.png")); this._box4.setPlaceholderFontColor(cc.color(255, 0, 0)); - this._box4.setPlaceHolder("Tooltip:"); + this._box4.setPlaceHolder("This editBox can't be touched!"); this._box4.x = 40; this._box4.y = -100; this._box4.setDelegate(this); this._box4.setFontColor(cc.color(5, 4, 10)); this._box4.setMaxLength(10); + this._box4.setTouchEnabled(false); this._box3.addChild(this._box4); var itemBack = new cc.MenuItemFont("Back", this.toExtensionsMainLayer, this); diff --git a/web b/web index 2292d7d1d7..15704c3342 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 2292d7d1d72c21090b4be77e4479689dceaa9a6c +Subproject commit 15704c33421bbd236299b6b965e63eb2a6b7172c