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

md transition

Browse Source
This commit is contained in:
Adam Bradley
2015-07-20 14:26:23 -05:00
parent 6f266549e1
commit 7ed53a4e7f
6 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ionic/components/view/view-controller.ts
View File

@@ -21,7 +21,8 @@ export class ViewController extends Ion {
injector: Injector,
elementRef: ElementRef
) {
super(elementRef, injector.get(IonicConfig));
let config = injector.get(IonicConfig);
super(elementRef, config);
this.parent = parentViewCtrl;
@@ -30,6 +31,7 @@ export class ViewController extends Ion {
this.viewMngr = injector.get(AppViewManager);
this.router = injector.get(IonicRouter);
this.app = injector.get(IonicApp);
this.config = config;
this.router.addViewController(this);
@@ -203,6 +205,9 @@ export class ViewController extends Ion {
if (opts.animate === false) {
opts.animation = 'none';
} else if (!opts.animation) {
opts.animation = this.config.setting('viewTransition');
}
opts.animate = (opts.animation !== 'none');