From cb49adcb0cae93be29f4c20e25d68850ff1f61dd Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Thu, 22 Oct 2015 12:57:19 -0500 Subject: [PATCH] fix(NavRouter): rename navigateInstruction to navigateByInstruction --- ionic/components/nav/nav-router.ts | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ionic/components/nav/nav-router.ts b/ionic/components/nav/nav-router.ts index b869ad7648..3ecb77acfa 100644 --- a/ionic/components/nav/nav-router.ts +++ b/ionic/components/nav/nav-router.ts @@ -74,22 +74,21 @@ export class NavRouter extends RouterOutlet { // viewCtrl is Ionic's ViewController class, which has the properties "componentType" and "params" // only do an update if there's an actual view change - // if (!viewCtrl || this._activeViewId === viewCtrl.id) return; - // this._activeViewId = viewCtrl.id; + if (!viewCtrl || this._activeViewId === viewCtrl.id) return; + this._activeViewId = viewCtrl.id; - // // get the best PathRecognizer for this view's componentType - // let pathRecognizer = this.getPathRecognizerByComponent(viewCtrl.componentType); - // if (pathRecognizer) { + // get the best PathRecognizer for this view's componentType + let pathRecognizer = this.getPathRecognizerByComponent(viewCtrl.componentType); + if (pathRecognizer) { - // // generate a componentInstruction from the view's PathRecognizer and params - // let componentInstruction = pathRecognizer.generate(viewCtrl.params.data); + // generate a componentInstruction from the view's PathRecognizer and params + let componentInstruction = pathRecognizer.generate(viewCtrl.params.data); - // // create an Instruction from the componentInstruction - // let instruction = new Instruction(componentInstruction, null); + // create an Instruction from the componentInstruction + let instruction = new Instruction(componentInstruction, null); - // // update the browser's URL - // this._parentRouter.navigateInstruction(instruction); - // } + this._parentRouter.navigateByInstruction(instruction); + } } /**