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

fix(modal): set root nav view controller

Browse Source
This commit is contained in:
Adam Bradley
2016-02-10 11:38:57 -06:00
parent 17c1846f05
commit 8bde8d7522
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ionic/components/modal/test/basic/index.ts
View File

@ -1,5 +1,5 @@
import {App, Page, Config, Platform} from 'ionic/ionic'; import {App, Page, Config, Platform} from 'ionic/ionic';
import {Modal, ActionSheet, NavController, NavParams, Animation, ViewController} from 'ionic/ionic'; import {Modal, ActionSheet, NavController, NavParams, Transition, ViewController} from 'ionic/ionic';
@Page({ @Page({
@ -284,8 +284,8 @@ class E2EApp {
} }
class FadeIn extends Animation { class FadeIn extends Transition {
constructor(enteringView, leavingView) { constructor(enteringView: ViewController, leavingView: ViewController) {
super(enteringView.pageRef()); super(enteringView.pageRef());
this this
.easing('ease') .easing('ease')
@ -295,10 +295,10 @@ class FadeIn extends Animation {
.before.addClass('show-page'); .before.addClass('show-page');
} }
} }
Animation.register('my-fade-in', FadeIn); Transition.register('my-fade-in', FadeIn);
class FadeOut extends Animation { class FadeOut extends Transition {
constructor(enteringView, leavingView) { constructor(enteringView: ViewController, leavingView: ViewController) {
super(leavingView.pageRef()); super(leavingView.pageRef());
this this
.easing('ease') .easing('ease')
@ -307,4 +307,4 @@ class FadeOut extends Animation {
.before.addClass('show-page'); .before.addClass('show-page');
} }
} }
Animation.register('my-fade-out', FadeOut); Transition.register('my-fade-out', FadeOut);

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

@ -416,6 +416,8 @@ export class NavController extends Ion {
return; return;
} }
enteringView.setNav(rootNav);
opts.keyboardClose = false; opts.keyboardClose = false;
opts.direction = 'forward'; opts.direction = 'forward';

1
ionic/ionic.ts
View File

@ -16,6 +16,7 @@ export * from './util/events'
export * from './util/keyboard' export * from './util/keyboard'
export * from './animations/animation' export * from './animations/animation'
export * from './transitions/transition'
export * from './translation/translate' export * from './translation/translate'
export * from './translation/translate_pipe' export * from './translation/translate_pipe'