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

Fix more js parser font setting error

This commit is contained in:
XiaoFeng 2016-01-06 20:42:27 +08:00
parent d82b6b6f1c
commit 0fcfb359d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,7 +565,7 @@
widget.setFontSize(fontSize); widget.setFontSize(fontSize);
var fontName = json["FontName"]; var fontName = json["FontName"];
if(fontName != null) if(fontName && "" !== fontName)
widget.setFontName(fontName); widget.setFontName(fontName);
var areaWidth = json["AreaWidth"]; var areaWidth = json["AreaWidth"];
@ -601,7 +601,7 @@
if(fontResource != null){ if(fontResource != null){
var path = fontResource["Path"]; var path = fontResource["Path"];
//resoutceType = fontResource["Type"]; //resoutceType = fontResource["Type"];
if(path != null){ if(path){
if (cc.sys.isNative) { if (cc.sys.isNative) {
fontName = cc.path.join(cc.loader.resPath, resourcePath, path); fontName = cc.path.join(cc.loader.resPath, resourcePath, path);
} else { } else {
@ -1133,7 +1133,7 @@
widget.setFontSize(fontSize); widget.setFontSize(fontSize);
var fontName = json["FontName"]; var fontName = json["FontName"];
if(fontName != null) if(fontName && "" !== fontName)
widget.setFontName(fontName); widget.setFontName(fontName);
var maxLengthEnabled = json["MaxLengthEnable"]; var maxLengthEnabled = json["MaxLengthEnable"];
@ -1154,7 +1154,7 @@
if(fontResource != null){ if(fontResource != null){
var path = fontResource["Path"]; var path = fontResource["Path"];
//resoutceType = fontResource["Type"]; //resoutceType = fontResource["Type"];
if(path != null){ if(path){
if (cc.sys.isNative) { if (cc.sys.isNative) {
fontName = cc.path.join(cc.loader.resPath, resourcePath, path); fontName = cc.path.join(cc.loader.resPath, resourcePath, path);
} else { } else {