Skip to content

Add ttc loader and prevent the pure digital fonts is invalid #2971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 6, 2015
Merged

Add ttc loader and prevent the pure digital fonts is invalid #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27cfa04
Add ttc loader and prevent the pure digital fonts is invalid
VisualSJ Jul 3, 2015
aa6b57a
Add ttc loader and prevent the pure digital fonts is invalid
VisualSJ Jul 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cocos2d/core/platform/CCLoaders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ cc._fontLoader = {
TYPE : {
".eot" : "embedded-opentype",
".ttf" : "truetype",
".ttc" : "truetype",
".woff" : "woff",
".svg" : "svg"
},
Expand All @@ -90,7 +91,11 @@ cc._fontLoader = {
fontStyle.type = "text/css";
doc.body.appendChild(fontStyle);

var fontStr = "@font-face { font-family:" + name + "; src:";
var fontStr = "";
if(isNaN(name - 0))
fontStr += "@font-face { font-family:" + name + "; src:";
else
fontStr += "@font-face { font-family:'" + name + "'; src:";
if(srcs instanceof Array){
for(var i = 0, li = srcs.length; i < li; i++){
var src = srcs[i];
Expand All @@ -99,9 +104,10 @@ cc._fontLoader = {
fontStr += (i === li - 1) ? ";" : ",";
}
}else{
type = type.toLowerCase();
fontStr += "url('" + srcs + "') format('" + TYPE[type] + "');";
}
fontStyle.textContent += fontStr + "};";
fontStyle.textContent += fontStr + "}";

//<div style="font-family: PressStart;">.</div>
var preloadDiv = cc.newElement("div");
Expand All @@ -126,7 +132,7 @@ cc._fontLoader = {
cb(null, true);
}
};
cc.loader.register(["font", "eot", "ttf", "woff", "svg"], cc._fontLoader);
cc.loader.register(["font", "eot", "ttf", "woff", "svg", "ttc"], cc._fontLoader);

cc._binaryLoader = {
load : function(realUrl, url, res, cb){
Expand Down
2 changes: 1 addition & 1 deletion extensions/cocostudio/loader/parsers/timelineParser-2.x.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@
if (cc.sys.isNative) {
fontName = cc.path.join(cc.loader.resPath, resourcePath, path);
} else {
fontName = path.match(/([^\/]+)\.ttf/);
fontName = path.match(/([^\/]+)\.(\S+)/);
fontName = fontName ? fontName[1] : "";
}
widget.setTitleFontName(fontName);
Expand Down