From d8a06533a44f204ec2a234c4b30e12092db39f21 Mon Sep 17 00:00:00 2001 From: ADjenkov Date: Mon, 17 Dec 2018 17:16:39 +0200 Subject: [PATCH 1/3] fix(p-r-o): needless forward navigation after back inside nested named outlet --- nativescript-angular/router/page-router-outlet.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts index 65e353ceb..a1481e2e4 100644 --- a/nativescript-angular/router/page-router-outlet.ts +++ b/nativescript-angular/router/page-router-outlet.ts @@ -423,9 +423,7 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire if (modalNavigation > 0) { // Modal with 'primary' p-r-o outlet = this.locationStrategy.findOutletByModal(modalNavigation); } else { - const pathByOutlets = this.locationStrategy.getPathByOutlets(topActivatedRoute); outlet = this.locationStrategy.findOutletByKey(outletKey); - outlet = outlet || this.locationStrategy.findOutletByOutletPath(pathByOutlets); } // Named lazy loaded outlet. @@ -436,6 +434,9 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire if (outlet) { outlet.outletKeys.push(outletKey); } + } else if (!outlet) { + const pathByOutlets = this.locationStrategy.getPathByOutlets(topActivatedRoute); + outlet = this.locationStrategy.findOutletByOutletPath(pathByOutlets); } return outlet; From 0a74a73294fcf701bf2162063abde8e089c2091f Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Thu, 20 Dec 2018 11:07:30 +0200 Subject: [PATCH 2/3] release: cut the 7.1.1 release --- CHANGELOG.md | 10 ++++++++++ nativescript-angular/package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 804aab96f..31b489224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [7.1.1](https://github.com/NativeScript/nativescript-angular/compare/7.1.0...7.1.1) (2018-12-20) + + +### Bug Fixes + +* **p-r-o:** needless forward navigation after back inside nested named outlet ([d8a0653](https://github.com/NativeScript/nativescript-angular/commit/d8a0653)) + + + # [7.1.0](https://github.com/NativeScript/nativescript-angular/compare/7.0.3...7.1.0) (2018-12-07) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 8477b29ce..22a25b6d1 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "7.1.0", + "version": "7.1.1", "description": "An Angular renderer that lets you build mobile apps with NativeScript.", "homepage": "https://www.nativescript.org/", "bugs": "https://github.com/NativeScript/nativescript-angular/issues", From d419285c8b35d094c776269d01f18b0d39e2dbfd Mon Sep 17 00:00:00 2001 From: Stanimira Vlaeva Date: Thu, 20 Dec 2018 18:21:37 +0200 Subject: [PATCH 3/3] docs: update changelog.md Co-Authored-By: SvetoslavTsenov --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31b489224..cf6c050eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bug Fixes -* **p-r-o:** needless forward navigation after back inside nested named outlet ([d8a0653](https://github.com/NativeScript/nativescript-angular/commit/d8a0653)) + * **page-router-outlet:** prevent needless forward navigation after back inside nested named outlet ([d8a0653](https://github.com/NativeScript/nativescript-angular/commit/d8a0653))