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

Merge pull request #14331 from chengstory/UpdateWebSubmodule 

[ci skip] Update web submodule to latest.
This commit is contained in:
pandamicro 2015-11-06 12:56:55 +08:00
parent b79957b11f 8183d34b68
commit 101962559e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js
View File

@ -496,7 +496,7 @@
this.widgetAttributes(widget, json);
var clipEnabled = json["ClipAble"];
var clipEnabled = json["ClipAble"] || false;
if(clipEnabled != null)
widget.setClippingEnabled(clipEnabled);
@ -777,7 +777,7 @@
widget.setBackGroundImage(path, type);
});
var clipEnabled = json["ClipAble"];
var clipEnabled = json["ClipAble"] || false;
widget.setClippingEnabled(clipEnabled);
var colorType = getParam(json["ComboBoxIndex"], 0);

2
web

@ -1 +1 @@
Subproject commit e52c98198fd8325017b213365180580be06d2259
Subproject commit 85518886f7ba8a618ec69bb75a9b7d67ea2d1c7d