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

fix(navCtrl): use lower level compiler API

Browse Source
This commit is contained in:
Adam Bradley
2015-11-30 20:05:47 -06:00
parent 022e0b5396
commit ede79c89c1
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import {Compiler, ElementRef, Injector, provide, NgZone, DynamicComponentLoader, AppViewManager, Renderer} from 'angular2/angular2';
import {Compiler, ElementRef, Injector, provide, NgZone, AppViewManager, Renderer} from 'angular2/angular2';
import {wtfLeave, wtfCreateScope} from 'angular2/angular2';
import {Ion} from '../ion';
@ -107,7 +107,6 @@ export class NavController extends Ion {
keyboard: Keyboard,
elementRef: ElementRef,
compiler: Compiler,
loader: DynamicComponentLoader,
viewManager: AppViewManager,
zone: NgZone,
renderer: Renderer
@ -120,7 +119,6 @@ export class NavController extends Ion {
this.keyboard = keyboard;
this._compiler = compiler;
this._loader = loader;
this._viewManager = viewManager;
this._zone = zone;
this._renderer = renderer;
@ -793,23 +791,34 @@ export class NavController extends Ion {
loadPage(viewCtrl, navbarContainerRef, opts, done) {
let wtfScope = wtfCreateScope('NavController#loadPage()')();
let providers = this.providers.concat(Injector.resolve([
provide(ViewController, {useValue: viewCtrl}),
provide(NavParams, {useValue: viewCtrl.params})
]));
// guts of DynamicComponentLoader#loadIntoLocation
this._compiler.compileInHost(viewCtrl.componentType).then(hostProtoViewRef => {
let providers = this.providers.concat(Injector.resolve([
provide(ViewController, {useValue: viewCtrl}),
provide(NavParams, {useValue: viewCtrl.params})
]));
this._loader.loadIntoLocation(viewCtrl.componentType, this.elementRef, 'contents', providers).then(componentRef => {
let location = this._viewManager.getNamedElementInComponentView(this.elementRef, 'contents');
let viewContainer = this._viewManager.getViewContainer(location);
let hostViewRef =
viewContainer.createHostView(hostProtoViewRef, viewContainer.length, providers);
let newLocation = this._viewManager.getHostElement(hostViewRef);
let component = this._viewManager.getComponent(newLocation);
viewCtrl.addDestroy(() => {
componentRef.dispose();
let index = viewContainer.indexOf(hostViewRef);
if (index !== -1) {
viewContainer.remove(index);
}
});
// a new ComponentRef has been created
// set the ComponentRef's instance to this ViewController
viewCtrl.setInstance(componentRef.instance);
viewCtrl.setInstance(component);
// remember the ElementRef to the ion-page elementRef that was just created
viewCtrl.setPageRef(componentRef.location);
viewCtrl.setPageRef(newLocation);
if (!navbarContainerRef) {
navbarContainerRef = viewCtrl.getNavbarViewRef();

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

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

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

@ -1,4 +1,4 @@
import {Component, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
import {Component, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {Config} from '../../config/config';
@ -20,13 +20,11 @@ export class OverlayNav extends NavController {
keyboard: Keyboard,
elementRef: ElementRef,
compiler: Compiler,
loader: DynamicComponentLoader,
viewManager: AppViewManager,
zone: NgZone,
renderer: Renderer
) {
super(null, app, config, keyboard, elementRef, compiler,
loader, viewManager, zone, renderer);
super(null, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer);
if (overlayCtrl.anchor) {
throw ('An app should only have one <ion-overlay></ion-overlay>');

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

@ -1,4 +1,4 @@
import {Component, Directive, Host, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
import {Component, Directive, Host, ElementRef, Compiler, AppViewManager, NgZone, Renderer} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {Config} from '../../config/config';
@ -76,14 +76,12 @@ export class Tab extends NavController {
keyboard: Keyboard,
elementRef: ElementRef,
compiler: Compiler,
loader: DynamicComponentLoader,
viewManager: AppViewManager,
zone: NgZone,
renderer: Renderer
) {
// A Tab is a NavController for its child pages
super(parentTabs, app, config, keyboard, elementRef, compiler,
loader, viewManager, zone, renderer);
super(parentTabs, app, config, keyboard, elementRef, compiler, viewManager, zone, renderer);
this._isInitial = parentTabs.add(this);