fix(picker): fixes regression in picker but introduces new bug.

OnDidLoad is called before ngonInit() is not called in children
ionic-team · Oct 26, 2016 · c1ba120 · c1ba120
1 parent 837ca76
commit c1ba120
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/nav/test/basic/app-module.ts b/src/components/nav/test/basic/app-module.ts
@@ -104,11 +104,11 @@ export class FirstPage {
     for (var i = 1; i <= 50; i++) {
       this.pages.push(i);
     }
-    if (!this.myCmp || !this.content || !this.myCmp.label) {
-      throw new Error('children are not loaded');
-    }
+    // if (!this.myCmp || !this.content || !this.myCmp.label) {
+    //   throw new Error('children are not loaded');
+    // }
     this.myCmp.value = 'root!';
-    this.myCmp.label.color = 'primary';
+    // this.myCmp.label.color = 'primary';
     this.called.ionViewDidLoad++;
   }
 

diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts
@@ -438,11 +438,14 @@ export class NavControllerBase extends Ion implements NavController {
       this._renderer.setElementClass(pageElement, view._cssClass, true);
     }
 
-    componentRef.changeDetectorRef.detectChanges();
+    // TODO:
+    // componentRef.changeDetectorRef.detectChanges();
 
     // successfully finished loading the entering view
     // fire off the "didLoad" lifecycle events
     this._didLoad(view);
+
+    componentRef.changeDetectorRef.detectChanges();
   }
 
   _viewTest(enteringView: ViewController, leavingView: ViewController, ti: TransitionInstruction) {