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

update web engine submodule, improve editbox tests (#18032)

This commit is contained in:
子龙山人 2017-07-06 10:27:52 +08:00 committed by minggo
parent 78e0cbfc5f
commit ecea0f4951
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js
View File

@ -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);

2
web

@ -1 +1 @@
Subproject commit 2292d7d1d72c21090b4be77e4479689dceaa9a6c
Subproject commit 15704c33421bbd236299b6b965e63eb2a6b7172c