fix(router): fix nested ion-nav router

ionic-team · Apr 6, 2016 · b063566 · b063566
1 parent 3df5989
commit b063566
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/ionic/components/nav/nav-router.ts b/ionic/components/nav/nav-router.ts
@@ -17,20 +17,28 @@ import {ViewController} from './view-controller';
 })
 export class NavRouter extends RouterOutlet {
   private _lastUrl: string;
+  private _nav: Nav;
+  private _parent: Router;
 
   constructor(
     elementRef: ElementRef,
     loader: DynamicComponentLoader,
-    private parentRouter: Router,
+    parentRouter: Router,
     @Attribute('name') nameAttr: string,
-    private _nav: Nav
+    nav: Nav
   ) {
+    if (nav.parent) {
+      parentRouter = parentRouter.childRouter(nav);
+    }
     super(elementRef, loader, parentRouter, nameAttr);
 
+    this._nav = nav;
+    this._parent = parentRouter;
+
     // register this router with Ionic's NavController
     // Ionic's NavController will call this NavRouter's "stateChange"
     // method when the NavController has...changed its state
-    _nav.registerRouter(this);
+    nav.registerRouter(this);
   }
 
   stateChange(direction: string, viewCtrl: ViewController) {
@@ -57,7 +65,7 @@ export class NavRouter extends RouterOutlet {
 
         this._lastUrl = url;
 
-        this['_parentRouter'].navigateByInstruction(instruction);
+        this._parent.navigateByInstruction(instruction);
 
         console.debug('NavRouter, stateChange, name:', viewCtrl.name, 'id:', viewCtrl.id, 'url:', url);
       }
@@ -68,7 +76,7 @@ export class NavRouter extends RouterOutlet {
     var previousInstruction = this['_currentInstruction'];
     this['_currentInstruction'] = nextInstruction;
     var componentType = nextInstruction.componentType;
-    var childRouter = this['_parentRouter'].childRouter(componentType);
+    var childRouter = this._parent.childRouter(componentType);
 
     // prevent double navigations to the same view
     let instruction = new ResolvedInstruction(nextInstruction, null, null);
@@ -92,7 +100,7 @@ export class NavRouter extends RouterOutlet {
 
   getPathRecognizerByComponent(componentType) {
     // given a componentType, figure out the best PathRecognizer to use
-    let rules = this.parentRouter.registry['_rules'];
+    let rules = this._parent.registry['_rules'];
 
     let pathRecognizer = null;
     rules.forEach((rule) => {

diff --git a/ionic/components/nav/test/nested/index.ts b/ionic/components/nav/test/nested/index.ts
@@ -13,9 +13,7 @@ import {Page, Config, IonicApp} from 'ionic-angular';
   `
 })
 export class Login {
-  constructor(nav: NavController) {
-    this.nav = nav;
-  }
+  constructor(private nav: NavController) {}
 
   goToAccount() {
     this.nav.push(Account);
@@ -48,9 +46,9 @@ export class Login {
   `
 })
 export class Account {
-  constructor(app: IonicApp, menu: MenuController) {
-    this.app = app;
-    this.menu = menu;
+  rootPage;
+
+  constructor(private app: IonicApp, private menu: MenuController) {
     this.rootPage = Dashboard;
   }
 
@@ -87,10 +85,8 @@ export class Account {
   `
 })
 export class Dashboard {
-  constructor(app: IonicApp, nav: NavController) {
-    this.app = app;
-    this.nav = nav;
-  }
+  constructor(private app: IonicApp, private nav: NavController) {}
+
   goToProfile() {
     this.nav.push(Profile);
   }
@@ -118,10 +114,8 @@ export class Dashboard {
   `
 })
 export class Profile {
-  constructor(app: IonicApp, nav: NavController) {
-    this.app = app;
-    this.nav = nav;
-  }
+  constructor(private app: IonicApp, private nav: NavController) {}
+
   goToDashboard() {
     this.nav.push(Dashboard);
   }
@@ -138,6 +132,8 @@ export class Profile {
   template: `<ion-nav id="root-nav" [root]="rootPage" swipeBackEnabled="false"></ion-nav>`
 })
 class E2EApp {
+  rootPage;
+
   constructor() {
     this.rootPage = Login;
   }