From 586e9685a565bb9e5eef715f417d4b115238f5e6 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Fri, 20 Mar 2015 14:56:21 +0200 Subject: [PATCH] Css loading fix --- ui/frame/frame-common.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts index 922577ae1..3a07a5041 100644 --- a/ui/frame/frame-common.ts +++ b/ui/frame/frame-common.ts @@ -58,7 +58,7 @@ function resolvePageFromEntry(entry: definition.NavigationEntry): pages.Page { page = moduleExports.createPage(); } else { - page = pageFromBuilder(moduleNamePath, entry.moduleName, moduleExports); + page = pageFromBuilder(moduleNamePath, moduleExports); } if (!(page && page instanceof pages.Page)) { @@ -82,7 +82,7 @@ function resolveFilePath(path, ext) { return fileNameResolver.resolveFileName(path, ext); } -function pageFromBuilder(moduleNamePath: string, moduleName: string, moduleExports: any): pages.Page { +function pageFromBuilder(moduleNamePath: string, moduleExports: any): pages.Page { var page: pages.Page; var element: view.View; @@ -97,7 +97,7 @@ function pageFromBuilder(moduleNamePath: string, moduleName: string, moduleExpor page = element; // Possible CSS file path. - var cssFileName = resolveFilePath(moduleName, "css"); + var cssFileName = resolveFilePath(moduleNamePath, "css"); if (cssFileName) { page.addCssFile(cssFileName); }