javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/driftyco/ionic2

Browse Source
This commit is contained in:
perry
2015-11-30 13:30:34 -06:00
parent d3f4aa4842 7b44ff36dc
commit 5b56cbb228
4 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ionic/components/nav/nav-controller.ts
View File

@ -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 {Ion} from '../ion';
import {IonicApp} from '../app/app'; import {IonicApp} from '../app/app';
@ -107,8 +107,7 @@ export class NavController extends Ion {
loader: DynamicComponentLoader, loader: DynamicComponentLoader,
viewManager: AppViewManager, viewManager: AppViewManager,
zone: NgZone, zone: NgZone,
renderer: Renderer, renderer: Renderer
cd: ChangeDetectorRef
) { ) {
super(elementRef, config); super(elementRef, config);
@ -122,7 +121,6 @@ export class NavController extends Ion {
this._viewManager = viewManager; this._viewManager = viewManager;
this._zone = zone; this._zone = zone;
this._renderer = renderer; this._renderer = renderer;
this._cd = cd;
this._views = []; this._views = [];
this._trnsTime = 0; this._trnsTime = 0;
@ -639,13 +637,6 @@ export class NavController extends Ion {
this.app.setEnabled(enableApp, duration); this.app.setEnabled(enableApp, duration);
this.setTransitioning(!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) { if (opts.pageType) {
transAnimation.before.addClass(opts.pageType); transAnimation.before.addClass(opts.pageType);
} }
@ -664,9 +655,6 @@ export class NavController extends Ion {
leavingView.didLeave(); leavingView.didLeave();
} }
// reattach the change detection
this._cd.reattach();
this._zone.run(() => { this._zone.run(() => {
if (this.keyboard.isOpen()) { if (this.keyboard.isOpen()) {
this.keyboard.onClose(() => { this.keyboard.onClose(() => {

7
ionic/components/nav/nav.ts
View File

@ -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 {IonicApp} from '../app/app';
import {Config} from '../../config/config'; import {Config} from '../../config/config';
@ -120,11 +120,10 @@ export class Nav extends NavController {
loader: DynamicComponentLoader, loader: DynamicComponentLoader,
viewManager: AppViewManager, viewManager: AppViewManager,
zone: NgZone, zone: NgZone,
renderer: Renderer, renderer: Renderer
cd: ChangeDetectorRef
) { ) {
super(hostNavCtrl, app, config, keyboard, elementRef, compiler, super(hostNavCtrl, app, config, keyboard, elementRef, compiler,
loader, viewManager, zone, renderer, cd); loader, viewManager, zone, renderer);
if (viewCtrl) { if (viewCtrl) {
// an ion-nav can also act as an ion-page within a parent ion-nav // an ion-nav can also act as an ion-page within a parent ion-nav

7
ionic/components/overlay/overlay.ts
View File

@ -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 {IonicApp} from '../app/app';
import {Config} from '../../config/config'; import {Config} from '../../config/config';
@ -23,11 +23,10 @@ export class OverlayNav extends NavController {
loader: DynamicComponentLoader, loader: DynamicComponentLoader,
viewManager: AppViewManager, viewManager: AppViewManager,
zone: NgZone, zone: NgZone,
renderer: Renderer, renderer: Renderer
cd: ChangeDetectorRef
) { ) {
super(null, app, config, keyboard, elementRef, compiler, super(null, app, config, keyboard, elementRef, compiler,
loader, viewManager, zone, renderer, cd); loader, viewManager, zone, renderer);
if (overlayCtrl.anchor) { if (overlayCtrl.anchor) {
throw ('An app should only have one <ion-overlay></ion-overlay>'); throw ('An app should only have one <ion-overlay></ion-overlay>');

7
ionic/components/tabs/tab.ts
View File

@ -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 {IonicApp} from '../app/app';
import {Config} from '../../config/config'; import {Config} from '../../config/config';
@ -79,12 +79,11 @@ export class Tab extends NavController {
loader: DynamicComponentLoader, loader: DynamicComponentLoader,
viewManager: AppViewManager, viewManager: AppViewManager,
zone: NgZone, zone: NgZone,
renderer: Renderer, renderer: Renderer
cd: ChangeDetectorRef
) { ) {
// A Tab is a NavController for its child pages // A Tab is a NavController for its child pages
super(parentTabs, app, config, keyboard, elementRef, compiler, super(parentTabs, app, config, keyboard, elementRef, compiler,
loader, viewManager, zone, renderer, cd); loader, viewManager, zone, renderer);
this._isInitial = parentTabs.add(this); this._isInitial = parentTabs.add(this);