Css loading fix

vakrilov · vakrilov · commit 586e9685a565 · 2015-03-20T14:56:49.000+02:00
diff --git 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 = <pages.Page>element;
 
             // Possible CSS file path.
-            var cssFileName = resolveFilePath(moduleName, "css");
+            var cssFileName = resolveFilePath(moduleNamePath, "css");
             if (cssFileName) {
                 page.addCssFile(cssFileName);
             }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function resolvePageFromEntry(entry: definition.NavigationEntry): pages.Page {`
`58`	`58`	`page = moduleExports.createPage();`
`59`	`59`	`}`
`60`	`60`	`else {`
`61`		`- page = pageFromBuilder(moduleNamePath, entry.moduleName, moduleExports);`
	`61`	`+ page = pageFromBuilder(moduleNamePath, moduleExports);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (!(page && page instanceof pages.Page)) {`
`@@ -82,7 +82,7 @@ function resolveFilePath(path, ext) {`
`82`	`82`	`return fileNameResolver.resolveFileName(path, ext);`
`83`	`83`	`}`
`84`	`84`
`85`		`-function pageFromBuilder(moduleNamePath: string, moduleName: string, moduleExports: any): pages.Page {`
	`85`	`+function pageFromBuilder(moduleNamePath: string, moduleExports: any): pages.Page {`
`86`	`86`	`var page: pages.Page;`
`87`	`87`	`var element: view.View;`
`88`	`88`
`@@ -97,7 +97,7 @@ function pageFromBuilder(moduleNamePath: string, moduleName: string, moduleExpor`
`97`	`97`	`page = <pages.Page>element;`
`98`	`98`
`99`	`99`	`// Possible CSS file path.`
`100`		`- var cssFileName = resolveFilePath(moduleName, "css");`
	`100`	`+ var cssFileName = resolveFilePath(moduleNamePath, "css");`
`101`	`101`	`if (cssFileName) {`
`102`	`102`	`page.addCssFile(cssFileName);`
`103`	`103`	`}`