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

Changed the patch to eliminate duplicate code now it only has the css loaded in one spot.

Browse Source
This commit is contained in:
Nathanael Anderson
2015-08-24 12:41:01 -05:00
parent 43a954f4a0
commit a95dafd72e
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/frame/frame-common.ts
View File

@ -57,10 +57,6 @@ export function resolvePageFromEntry(entry: definition.NavigationEntry): pages.P
if (moduleExports && moduleExports.createPage) { if (moduleExports && moduleExports.createPage) {
trace.write("Calling createPage()", trace.categories.Navigation); trace.write("Calling createPage()", trace.categories.Navigation);
page = moduleExports.createPage(); page = moduleExports.createPage();
var cssFileName = fileResolverModule.resolveFileName(moduleNamePath, "css");
if (cssFileName && page && page.addCssFile) {
page.addCssFile(cssFileName);
}
} }
else { else {
page = pageFromBuilder(moduleNamePath, moduleExports); page = pageFromBuilder(moduleNamePath, moduleExports);
@ -69,6 +65,12 @@ export function resolvePageFromEntry(entry: definition.NavigationEntry): pages.P
if (!(page && page instanceof pages.Page)) { if (!(page && page instanceof pages.Page)) {
throw new Error("Failed to load Page from entry.moduleName: " + entry.moduleName); throw new Error("Failed to load Page from entry.moduleName: " + entry.moduleName);
} }
// Possible CSS file path.
var cssFileName = fileResolverModule.resolveFileName(moduleNamePath, "css");
if (cssFileName) {
page.addCssFile(cssFileName);
}
} }
return page; return page;
@ -87,12 +89,6 @@ function pageFromBuilder(moduleNamePath: string, moduleExports: any): pages.Page
element = builder.load(fileName, moduleExports); element = builder.load(fileName, moduleExports);
if (element instanceof pages.Page) { if (element instanceof pages.Page) {
page = <pages.Page>element; page = <pages.Page>element;
// Possible CSS file path.
var cssFileName = fileResolverModule.resolveFileName(moduleNamePath, "css");
if (cssFileName) {
page.addCssFile(cssFileName);
}
} }
} }