Add ttc loader and prevent the pure digital fonts is invalid

VisualSJ · VisualSJ · commit aa6b57aaf085 · 2015-07-03T17:17:34.000+08:00
diff --git a/cocos2d/core/platform/CCLoaders.js b/cocos2d/core/platform/CCLoaders.js
@@ -88,7 +88,6 @@ cc._fontLoader = {
     },
     _loadFont : function(name, srcs, type){
         var doc = document, path = cc.path, TYPE = this.TYPE, fontStyle = cc.newElement("style");
-        type = type.toLowerCase();
         fontStyle.type = "text/css";
         doc.body.appendChild(fontStyle);
 
@@ -105,6 +104,7 @@ cc._fontLoader = {
                 fontStr += (i === li - 1) ? ";" : ",";
             }
         }else{
+            type = type.toLowerCase();
             fontStr += "url('" + srcs + "') format('" + TYPE[type] + "');";
         }
         fontStyle.textContent += fontStr + "}";

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ cc._fontLoader = {`
`88`	`88`	`},`
`89`	`89`	`_loadFont : function(name, srcs, type){`
`90`	`90`	`var doc = document, path = cc.path, TYPE = this.TYPE, fontStyle = cc.newElement("style");`
`91`		`- type = type.toLowerCase();`
`92`	`91`	`fontStyle.type = "text/css";`
`93`	`92`	`doc.body.appendChild(fontStyle);`
`94`	`93`
`@@ -105,6 +104,7 @@ cc._fontLoader = {`
`105`	`104`	`fontStr += (i === li - 1) ? ";" : ",";`
`106`	`105`	`}`
`107`	`106`	`}else{`
	`107`	`+ type = type.toLowerCase();`
`108`	`108`	`fontStr += "url('" + srcs + "') format('" + TYPE[type] + "');";`
`109`	`109`	`}`
`110`	`110`	`fontStyle.textContent += fontStr + "}";`