diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 3c7ca5f6a3..5491457e69 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -1,4 +1,4 @@
-import {Compiler, ElementRef, Injector, provide, NgZone, AppViewManager, Renderer} from 'angular2/angular2';
+import {ChangeDetectorRef, Compiler, ElementRef, Injector, provide, NgZone, AppViewManager, Renderer} from 'angular2/angular2';
import {wtfLeave, wtfCreateScope, WtfScopeFn} from 'angular2/angular2';
import {Ion} from '../ion';
@@ -115,7 +115,8 @@ export class NavController extends Ion {
compiler: Compiler,
viewManager: AppViewManager,
zone: NgZone,
- renderer: Renderer
+ renderer: Renderer,
+ cd: ChangeDetectorRef
) {
super(elementRef, config);
@@ -128,6 +129,7 @@ export class NavController extends Ion {
this._viewManager = viewManager;
this._zone = zone;
this._renderer = renderer;
+ this._cd = cd;
this._views = [];
this._trnsTime = 0;
@@ -686,6 +688,8 @@ export class NavController extends Ion {
return done(enteringView);
}
+ this._cd.detectChanges();
+
this._zone.runOutsideAngular(() => {
this._setZIndex(enteringView, leavingView, opts.direction);
diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index ff429f396c..757871d8ff 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, Renderer, ViewContainerRef} from 'angular2/angular2';
+import {ChangeDetectorRef, Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, Renderer, ViewContainerRef} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {Config} from '../../config/config';
@@ -119,9 +119,10 @@ export class Nav extends NavController {
compiler: Compiler,
viewManager: AppViewManager,
zone: NgZone,
- renderer: Renderer
+ renderer: Renderer,
+ cd: ChangeDetectorRef
) {
- super(hostNavCtrl, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer);
+ super(hostNavCtrl, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer, cd);
if (viewCtrl) {
// an ion-nav can also act as an ion-page within a parent ion-nav
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index b9b9572945..4b1a8ea21f 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -63,16 +63,10 @@ class FirstPage {
}
}
- onPageLoaded() {
- console.log('onPageLoaded');
- var meNoWorky = true;
- meNoWorky(helloIsItMeYoureLookingFor);
- }
-
onPageDidEnter() {
- // setTimeout(() => {
- // this.nav.push(PrimaryHeaderPage);
- // }, 2000);
+ setTimeout(() => {
+ this.nav.push(PrimaryHeaderPage);
+ }, 1000);
}
setPages() {
@@ -83,8 +77,8 @@ class FirstPage {
this.nav.setPages(items);
}
- setRoot(PrimaryHeaderPage) {
-
+ setRoot() {
+ this.nav.setRoot(PrimaryHeaderPage);
}
pushPrimaryHeaderPage() {
diff --git a/ionic/components/overlay/overlay.ts b/ionic/components/overlay/overlay.ts
index fa84dd54b2..b982200b45 100644
--- a/ionic/components/overlay/overlay.ts
+++ b/ionic/components/overlay/overlay.ts
@@ -1,4 +1,4 @@
-import {Component, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
+import {ChangeDetectorRef, Component, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {Config} from '../../config/config';
@@ -22,9 +22,10 @@ export class OverlayNav extends NavController {
compiler: Compiler,
viewManager: AppViewManager,
zone: NgZone,
- renderer: Renderer
+ renderer: Renderer,
+ cd: ChangeDetectorRef
) {
- super(null, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer);
+ super(null, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer, cd);
if (overlayCtrl.anchor) {
throw ('An app should only have one ');
diff --git a/ionic/components/tabs/tab.ts b/ionic/components/tabs/tab.ts
index 8f255c6fa7..1ce3c73d90 100644
--- a/ionic/components/tabs/tab.ts
+++ b/ionic/components/tabs/tab.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, Host, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
+import {ChangeDetectorRef, Component, Directive, Host, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {Config} from '../../config/config';
@@ -78,10 +78,11 @@ export class Tab extends NavController {
compiler: Compiler,
viewManager: AppViewManager,
zone: NgZone,
- renderer: Renderer
+ renderer: Renderer,
+ cd: ChangeDetectorRef
) {
// A Tab is a NavController for its child pages
- super(parentTabs, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer);
+ super(parentTabs, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer, cd);
this._isInitial = parentTabs.add(this);
diff --git a/ionic/components/tap-click/ripple.ts b/ionic/components/tap-click/ripple.ts
index 796538c1e9..e3c4cafde1 100644
--- a/ionic/components/tap-click/ripple.ts
+++ b/ionic/components/tap-click/ripple.ts
@@ -5,8 +5,8 @@ import {raf, rafFrames} from '../../util/dom';
export class RippleActivator extends Activator {
- constructor(app, config) {
- super(app, config);
+ constructor(app, config, zone) {
+ super(app, config, zone);
this.expands = {};
this.fades = {};
diff --git a/ionic/components/text-input/test/input-focus/main.html b/ionic/components/text-input/test/input-focus/main.html
index 668ebbfb19..1c82634a14 100644
--- a/ionic/components/text-input/test/input-focus/main.html
+++ b/ionic/components/text-input/test/input-focus/main.html
@@ -1,12 +1,12 @@
-
+
Inset Focus
-
+