Merge pull request #532 from akira-cn/master

no default font Arial on android
cocos2d · Jul 2, 2014 · f43a7e6 · f43a7e6
2 parents f94e605 + 1e14078
commit f43a7e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frameworks/js-bindings/bindings/script/jsb_create_apis.js b/frameworks/js-bindings/bindings/script/jsb_create_apis.js
@@ -762,7 +762,7 @@ cc.LabelTTF.prototype._ctor = function(text, fontName, fontSize, dimensions, hAl
 		this.initWithStringAndTextDefinition(text, fontName);
 	}
 	else {
-		fontName = fontName || "Arial";
+		fontName = fontName || "";
 		fontSize = fontSize || 16;
 		dimensions = dimensions || cc.size(0,0);
 		hAlignment = hAlignment === undefined ? cc.TEXT_ALIGNMENT_LEFT : hAlignment;
@@ -927,7 +927,7 @@ cc.LabelTTF.create = function (text, fontName, fontSize, dimensions, hAlignment,
         label = cc.LabelTTF.createWithFontDefinition(text, fontName);
     }
     else {
-        fontName = fontName || "Arial";
+        fontName = fontName || "";
         fontSize = fontSize || 16;
         dimensions = dimensions || cc.size(0, 0);
         hAlignment = hAlignment == undefined ? cc.TEXT_ALIGNMENT_CENTER : hAlignment;