From b487aa0790045b0e2484097284fe877d7ef4eb30 Mon Sep 17 00:00:00 2001
From: Panayot Cankov <panayot.cankov@telerik.com>
Date: Thu, 9 Mar 2017 13:47:36 +0200
Subject: [PATCH] Fix application.cssFile var, promoted to get/set function

---
 tns-core-modules/application/application-common.ts |  8 ++++++--
 tns-core-modules/application/application.d.ts      | 11 +++++------
 tns-core-modules/ui/styling/style-scope.ts         |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts
index c371e9c30..b55b33096 100644
--- a/tns-core-modules/application/application-common.ts
+++ b/tns-core-modules/application/application-common.ts
@@ -20,7 +20,7 @@ export const lowMemoryEvent = "lowMemory";
 export const uncaughtErrorEvent = "uncaughtError";
 export const orientationChangedEvent = "orientationChanged";
 
-export let cssFile: string = "app.css";
+let cssFile: string = "app.css";
 
 export let mainModule: string;
 export let mainEntry: NavigationEntry;
@@ -48,10 +48,14 @@ export function livesync() {
 }
 
 export function setCssFileName(cssFileName: string) {
-    exports.cssFile = cssFileName;
+    cssFile = cssFileName;
     events.notify(<CssChangedEventData>{ eventName: "cssChanged", object: app, cssFile: cssFileName });
 }
 
+export function getCssFileName(): string {
+    return cssFile;
+}
+
 export function addCss(cssText: string): void {
     events.notify(<CssChangedEventData>{ eventName: "cssChanged", object: app, cssText: cssText });
 }
diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts
index ef0eec2d3..e6f4702bb 100644
--- a/tns-core-modules/application/application.d.ts
+++ b/tns-core-modules/application/application.d.ts
@@ -126,17 +126,16 @@ export var resources: any;
  */
 export function setResources(resources: any);
 
-/**
- * The application level css file name (starting from the application root). Used to set css across all pages.
- * Css will be applied for every page and page css will be applied after.
- */
-export var cssFile: string;
-
 /**
  * Sets css file name for the application. 
  */
 export function setCssFileName(cssFile: string): void;
 
+/**
+ * Gets css file name for the application.
+ */
+export function getCssFileName(): string;
+
 export function addCss(cssText: string): void;
 
 /**
diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts
index f1b227406..5efd141e7 100644
--- a/tns-core-modules/ui/styling/style-scope.ts
+++ b/tns-core-modules/ui/styling/style-scope.ts
@@ -372,4 +372,4 @@ class InlineSelector extends SelectorCore {
     public match(node: Node): boolean { return true; }
 }
 
-loadCss(application.cssFile);
+loadCss(application.getCssFileName());