From de5419d86fc355ca2b3b3792c9e63f76fad92806 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Wed, 8 Apr 2015 16:16:25 +0300 Subject: [PATCH] Frame current entry on first navigation --- ui/frame/frame.ios.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ui/frame/frame.ios.ts b/ui/frame/frame.ios.ts index 420b557a6..1b84fbdfe 100644 --- a/ui/frame/frame.ios.ts +++ b/ui/frame/frame.ios.ts @@ -231,7 +231,14 @@ class UINavigationControllerImpl extends UINavigationController implements UINav var newEntry: definition.BackstackEntry = viewController[ENTRY]; var newPage = newEntry.resolvedPage; if (!newPage.parent) { - frame._navigateToEntry = newEntry; + if (!frame._currentEntry) { + // First navigation + frame._currentEntry = newEntry; + } + else { + frame._navigateToEntry = newEntry; + } + frame._addView(newPage); frame.populateMenuItems(newPage); } @@ -270,7 +277,7 @@ class UINavigationControllerImpl extends UINavigationController implements UINav frame.updateNavigationBar(); var newPage = newEntry.resolvedPage; - + // notify the page newPage.onNavigatedTo(newEntry.entry.context); frame._processNavigationQueue(newPage); @@ -283,7 +290,7 @@ class UINavigationControllerImpl extends UINavigationController implements UINav /* tslint:disable */ class iOSFrame implements definition.iOSFrame { -/* tslint:enable */ + /* tslint:enable */ private _controller: UINavigationControllerImpl; private _showNavigationBar: boolean; private _navBarVisibility: string;