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

refactor(angular): update angular specific nav stuff to only use interfaces from @ionic/core

Browse Source
This commit is contained in:
Dan Bucholtz
2017-11-22 15:41:53 -06:00
parent 2e2c9008af
commit b634ffcff3
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/angular/src/directives/ion-nav.ts
View File

@ -14,8 +14,10 @@ import {
ViewChild
} from '@angular/core';
import { NavController, ViewController } from '@ionic/core';
import { PublicNav, PublicViewController } from '@ionic/core';
import { App } from '../providers/app';
import { NavController as InjectableNavController } from '../providers/nav-controller';
@Component({
@ -36,7 +38,7 @@ export class IonNavDelegate {
controllerElement.delegate = this;
}
attachViewToDom(nav: NavController, enteringView: ViewController): Promise<any> {
attachViewToDom(nav: PublicNav, enteringView: PublicViewController): Promise<any> {
return new Promise((resolve, reject) => {
this.zone.run(() => {
@ -45,7 +47,7 @@ export class IonNavDelegate {
provide: NavControllerToken, useValue: nav.element,
},
{
provide: NavController, useFactory: provideNavControllerInjectable, deps: [NavControllerToken]
provide: InjectableNavController, useFactory: provideNavControllerInjectable, deps: [NavControllerToken]
},
{
@ -75,7 +77,7 @@ export class IonNavDelegate {
});
}
removeViewFromDom(nav: NavController, viewController: ViewController) {
removeViewFromDom(nav: PublicNav, viewController: PublicViewController) {
return new Promise((resolve, reject) => {
this.zone.run(() => {