From 4e57749d1aff1b7432649698560d32c3c37f9d42 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Tue, 31 May 2016 18:09:08 +0300 Subject: [PATCH] Fixed: IOS - crash canceling swipe-back navigation --- nativescript-angular/router/page-router-outlet.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts index a047cf4a8..3efdf75b1 100644 --- a/nativescript-angular/router/page-router-outlet.ts +++ b/nativescript-angular/router/page-router-outlet.ts @@ -179,12 +179,12 @@ export class PageRouterOutlet extends RouterOutlet { this.location.navigateToNewPage(); return new Promise((resolve, reject) => { - page.on('navigatedTo', () => { - // Finish activation when page is fully navigated to. + page.on('navigatingTo', () => { + // Finish activation when page navigation has started resolve(componentRef) }); - page.on('navigatingFrom', (global).Zone.current.wrap((args: NavigatedData) => { + page.on('navigatedFrom', (global).Zone.current.wrap((args: NavigatedData) => { if (args.isBackNavigation) { this.location.beginBackPageNavigation(); this.location.back();