fix(p-r-o): needless forward navigation after back inside nested name…

…d outlet
NativeScript · Dec 17, 2018 · 130e392 · 130e392
1 parent d5ccaf5
commit 130e392
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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;