javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #273 from NativeScript/feature/frame-current-entry

Browse Source 
Frame current entry on first navigation
This commit is contained in:
Alexander Vakrilov
2015-04-09 18:10:07 +03:00
parent 937bf1efac de5419d86f
commit bd11762db1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ui/frame/frame.ios.ts
View File

@@ -231,7 +231,14 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
var newEntry: definition.BackstackEntry = viewController[ENTRY]; var newEntry: definition.BackstackEntry = viewController[ENTRY];
var newPage = newEntry.resolvedPage; var newPage = newEntry.resolvedPage;
if (!newPage.parent) { if (!newPage.parent) {
frame._navigateToEntry = newEntry; if (!frame._currentEntry) {
// First navigation
frame._currentEntry = newEntry;
}
else {
frame._navigateToEntry = newEntry;
}
frame._addView(newPage); frame._addView(newPage);
frame.populateMenuItems(newPage); frame.populateMenuItems(newPage);
} }
@@ -270,7 +277,7 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
frame.updateNavigationBar(); frame.updateNavigationBar();
var newPage = newEntry.resolvedPage; var newPage = newEntry.resolvedPage;
// notify the page // notify the page
newPage.onNavigatedTo(newEntry.entry.context); newPage.onNavigatedTo(newEntry.entry.context);
frame._processNavigationQueue(newPage); frame._processNavigationQueue(newPage);
@@ -283,7 +290,7 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
/* tslint:disable */ /* tslint:disable */
class iOSFrame implements definition.iOSFrame { class iOSFrame implements definition.iOSFrame {
/* tslint:enable */ /* tslint:enable */
private _controller: UINavigationControllerImpl; private _controller: UINavigationControllerImpl;
private _showNavigationBar: boolean; private _showNavigationBar: boolean;
private _navBarVisibility: string; private _navBarVisibility: string;