diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index e4ee9a1c3e..a66a209c7c 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/ionic/components/nav/nav-controller.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Compiler, ElementRef, Injector, provide, NgZone, DynamicComponentLoader, AppViewManager, Renderer} from 'angular2/angular2'; +import {Compiler, ElementRef, Injector, provide, NgZone, DynamicComponentLoader, AppViewManager, Renderer} from 'angular2/angular2'; import {Ion} from '../ion'; import {IonicApp} from '../app/app'; @@ -107,8 +107,7 @@ export class NavController extends Ion { loader: DynamicComponentLoader, viewManager: AppViewManager, zone: NgZone, - renderer: Renderer, - cd: ChangeDetectorRef + renderer: Renderer ) { super(elementRef, config); @@ -122,7 +121,6 @@ export class NavController extends Ion { this._viewManager = viewManager; this._zone = zone; this._renderer = renderer; - this._cd = cd; this._views = []; this._trnsTime = 0; @@ -639,13 +637,6 @@ export class NavController extends Ion { this.app.setEnabled(enableApp, duration); this.setTransitioning(!enableApp, duration); - if (!enableApp) { - // do a quick check for changes - // then detach the change detection during a transition - this._cd.detectChanges(); - this._cd.detach(); - } - if (opts.pageType) { transAnimation.before.addClass(opts.pageType); } @@ -664,9 +655,6 @@ export class NavController extends Ion { leavingView.didLeave(); } - // reattach the change detection - this._cd.reattach(); - this._zone.run(() => { if (this.keyboard.isOpen()) { this.keyboard.onClose(() => { diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts index c1ef17c504..bf69f5210d 100644 --- a/ionic/components/nav/nav.ts +++ b/ionic/components/nav/nav.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, DynamicComponentLoader, Renderer, ViewContainerRef} from 'angular2/angular2'; +import {Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, DynamicComponentLoader, Renderer, ViewContainerRef} from 'angular2/angular2'; import {IonicApp} from '../app/app'; import {Config} from '../../config/config'; @@ -120,11 +120,10 @@ export class Nav extends NavController { loader: DynamicComponentLoader, viewManager: AppViewManager, zone: NgZone, - renderer: Renderer, - cd: ChangeDetectorRef + renderer: Renderer ) { super(hostNavCtrl, app, config, keyboard, elementRef, compiler, - loader, viewManager, zone, renderer, cd); + loader, viewManager, zone, renderer); if (viewCtrl) { // an ion-nav can also act as an ion-page within a parent ion-nav diff --git a/ionic/components/overlay/overlay.ts b/ionic/components/overlay/overlay.ts index 685c6b9aa7..19d11356c3 100644 --- a/ionic/components/overlay/overlay.ts +++ b/ionic/components/overlay/overlay.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Renderer} from 'angular2/angular2'; +import {Component, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Renderer} from 'angular2/angular2'; import {IonicApp} from '../app/app'; import {Config} from '../../config/config'; @@ -23,11 +23,10 @@ export class OverlayNav extends NavController { loader: DynamicComponentLoader, viewManager: AppViewManager, zone: NgZone, - renderer: Renderer, - cd: ChangeDetectorRef + renderer: Renderer ) { super(null, app, config, keyboard, elementRef, compiler, - loader, viewManager, zone, renderer, cd); + loader, viewManager, zone, renderer); 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 b2c9d6fb13..da60f9379f 100644 --- a/ionic/components/tabs/tab.ts +++ b/ionic/components/tabs/tab.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, Directive, Host, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Renderer} from 'angular2/angular2'; +import {Component, Directive, Host, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Renderer} from 'angular2/angular2'; import {IonicApp} from '../app/app'; import {Config} from '../../config/config'; @@ -79,12 +79,11 @@ export class Tab extends NavController { loader: DynamicComponentLoader, viewManager: AppViewManager, zone: NgZone, - renderer: Renderer, - cd: ChangeDetectorRef + renderer: Renderer ) { // A Tab is a NavController for its child pages super(parentTabs, app, config, keyboard, elementRef, compiler, - loader, viewManager, zone, renderer, cd); + loader, viewManager, zone, renderer); this._isInitial = parentTabs.add(this);