From a95dafd72ecdf46ec73c57014e8bf078bb9459cb Mon Sep 17 00:00:00 2001
From: Nathanael Anderson <nathan@master-technology.com>
Date: Mon, 24 Aug 2015 12:41:01 -0500
Subject: [PATCH] Changed the patch to eliminate duplicate code now it only has
 the css loaded in one spot.

---
 ui/frame/frame-common.ts | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts
index cfc4e6295..f76be238c 100644
--- a/ui/frame/frame-common.ts
+++ b/ui/frame/frame-common.ts
@@ -57,10 +57,6 @@ export function resolvePageFromEntry(entry: definition.NavigationEntry): pages.P
         if (moduleExports && moduleExports.createPage) {
             trace.write("Calling createPage()", trace.categories.Navigation);
             page = moduleExports.createPage();
-            var cssFileName = fileResolverModule.resolveFileName(moduleNamePath, "css");
-            if (cssFileName && page && page.addCssFile) {
-                page.addCssFile(cssFileName);
-            }
         }
         else {
             page = pageFromBuilder(moduleNamePath, moduleExports);
@@ -69,6 +65,12 @@ export function resolvePageFromEntry(entry: definition.NavigationEntry): pages.P
         if (!(page && page instanceof pages.Page)) {
             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;
@@ -87,12 +89,6 @@ function pageFromBuilder(moduleNamePath: string, moduleExports: any): pages.Page
         element = builder.load(fileName, moduleExports);
         if (element instanceof pages.Page) {
             page = <pages.Page>element;
-
-            // Possible CSS file path.
-            var cssFileName = fileResolverModule.resolveFileName(moduleNamePath, "css");
-            if (cssFileName) {
-                page.addCssFile(cssFileName);
-            }
         }
     }