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

fix(modal): canEnter is called in modals

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-10-12 22:56:24 +02:00
parent 1300cbd7c0
commit a40b42c055
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/navigation/nav-controller-base.ts
View File

@ -432,6 +432,7 @@ export class NavControllerBase extends Ion implements NavController {
// create ComponentRef and set it to the entering view // create ComponentRef and set it to the entering view
enteringView.init(componentFactory.create(childInjector, [])); enteringView.init(componentFactory.create(childInjector, []));
enteringView._state = ViewState.INITIALIZED; enteringView._state = ViewState.INITIALIZED;
this._willLoad(enteringView);
} }
_viewTest(enteringView: ViewController, leavingView: ViewController, ti: TransitionInstruction) { _viewTest(enteringView: ViewController, leavingView: ViewController, ti: TransitionInstruction) {
@ -549,7 +550,6 @@ export class NavControllerBase extends Ion implements NavController {
_viewInsert(view: ViewController, componentRef: ComponentRef<any>, viewport: ViewContainerRef) { _viewInsert(view: ViewController, componentRef: ComponentRef<any>, viewport: ViewContainerRef) {
// successfully finished loading the entering view // successfully finished loading the entering view
// fire off the "didLoad" lifecycle events // fire off the "didLoad" lifecycle events
this._willLoad(view);
this._didLoad(view); this._didLoad(view);
// render the component ref instance to the DOM // render the component ref instance to the DOM