javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2512 from NativeScript/hdeshev/bundle-ios-fonts-dir

Browse Source 
Fix iOS font registration when bundling scripts.
This commit is contained in:
Hristo Deshev
2016-07-27 14:41:47 +03:00
committed by GitHub
parent 97870f33a7 2a94532865
commit 288ce00257
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tns-core-modules/ui/styling/font.ios.ts
View File

@ -315,11 +315,10 @@ export module ios {
}
}
function registerCustomFonts() {
var fontsFolderPath = fs.path.join(__dirname.substring(0, __dirname.indexOf("/tns_modules")), "fonts");
if (fs.Folder.exists(fontsFolderPath)) {
var fontsFolder = fs.Folder.fromPath(fontsFolderPath);
var onEachEntityFunc = function (fileEntity: fs.FileSystemEntity): boolean {
function registerFontsInFolder(fontsFolderPath) {
const fontsFolder = fs.Folder.fromPath(fontsFolderPath);
fontsFolder.eachEntity((fileEntity: fs.FileSystemEntity) => {
if (fs.Folder.exists(fs.path.join(fontsFolderPath, fileEntity.name))) {
return true;
}
@ -329,9 +328,14 @@ function registerCustomFonts() {
ios.registerFont(fileEntity.name);
}
return true;
}
});
}
fontsFolder.eachEntity(onEachEntityFunc);
function registerCustomFonts() {
const appDir = fs.knownFolders.currentApp().path
const fontsDir = fs.path.join(appDir, "fonts");
if (fs.Folder.exists(fontsDir)) {
registerFontsInFolder(fontsDir);
}
}