From 2572cc13f7fd7c52b23f58604d9c064678ae2d22 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Wed, 9 Mar 2016 14:35:20 +0200
Subject: [PATCH] Code file exports fixed

---
 apps/tests/xml-declaration/xml-declaration-tests.ts | 7 +++++++
 ui/builder/builder.ts                               | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/apps/tests/xml-declaration/xml-declaration-tests.ts b/apps/tests/xml-declaration/xml-declaration-tests.ts
index 90766c3d7..aa7f93fd9 100644
--- a/apps/tests/xml-declaration/xml-declaration-tests.ts
+++ b/apps/tests/xml-declaration/xml-declaration-tests.ts
@@ -166,6 +166,13 @@ export function test_parse_ShouldResolveExportsFromCodeFile() {
     TKUnit.assert((<any>page).customCodeLoaded, "Parse should resolve exports from custom code file.");
 }
 
+export function test_parse_ShouldResolveExportsFromCodeFileForPageContent() {
+    var page = builder.parse("<Page codeFile='~/xml-declaration/custom-code-file' loaded='loaded'><Button loaded='loaded' /></Page>");
+    (<any>page).content._emit("loaded");
+
+    TKUnit.assert((<any>page).content.customCodeLoaded, "Parse should resolve exports from custom code file for page content.");
+}
+
 export function test_parse_ShouldThrowErrorWhenInvalidCodeFileIsSpecified() {
     var e: Error;
     try {
diff --git a/ui/builder/builder.ts b/ui/builder/builder.ts
index d7f0b600a..b3df917f7 100644
--- a/ui/builder/builder.ts
+++ b/ui/builder/builder.ts
@@ -485,6 +485,10 @@ namespace xml2ui {
 
                             if (this.rootComponentModule && this.rootComponentModule.component instanceof Page) {
                                 this.currentPage = <Page>this.rootComponentModule.component;
+                                
+                                if((<any>this.currentPage).exports){
+                                    this.context = (<any>this.currentPage).exports;
+                                }
                             }
                         }