Merge pull request #1668 from NativeScript/release-7.1.1

release: cut the 7.1.1 release

Author: SvetoslavTsenov

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="7.1.1"></a>
+## [7.1.1](https://github.com/NativeScript/nativescript-angular/compare/7.1.0...7.1.1) (2018-12-20)
+
+
+### Bug Fixes
+
+ * **page-router-outlet:** prevent needless forward navigation after back inside nested named outlet ([d8a0653](https://github.com/NativeScript/nativescript-angular/commit/d8a0653))
+
+
+
 <a name="7.1.0"></a>
 # [7.1.0](https://github.com/NativeScript/nativescript-angular/compare/7.0.3...7.1.0) (2018-12-07)
 

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",

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;