From 819a45b99a376994be14d09a3bcd5c013eb05fe4 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Tue, 31 May 2016 15:58:18 +0300
Subject: [PATCH] Close current modal page on livesync

---
 tns-core-modules/ui/frame/frame-common.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
index 9886985e9..4740db8c9 100644
--- a/tns-core-modules/ui/frame/frame-common.ts
+++ b/tns-core-modules/ui/frame/frame-common.ts
@@ -39,6 +39,10 @@ function buildEntryFromArgs(arg: any): definition.NavigationEntry {
 export function reloadPage(): void {
     let frame = topmost();
     if (frame) {
+        if (frame.currentPage && (<any>frame.currentPage)._modal) {
+            (<any>frame.currentPage)._modal.closeModal();
+        }
+
         let currentEntry = frame._currentEntry.entry;
         let newEntry: definition.NavigationEntry = {
             animated: false,
@@ -317,13 +321,13 @@ export class Frame extends CustomLayoutView implements definition.Frame {
 
     public _goBackCore(backstackEntry: definition.BackstackEntry) {
         if (trace.enabled) {
-            trace.write(`${this}._goBackCore(${this._backstackEntryTrace(backstackEntry) }); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation);
+            trace.write(`${this}._goBackCore(${this._backstackEntryTrace(backstackEntry)}); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation);
         }
     }
 
     public _navigateCore(backstackEntry: definition.BackstackEntry) {
         if (trace.enabled) {
-            trace.write(`${this}._navigateCore(${this._backstackEntryTrace(backstackEntry) }); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation);
+            trace.write(`${this}._navigateCore(${this._backstackEntryTrace(backstackEntry)}); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation);
         }
     }