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

fix(overlay): expose "animated" API

Browse Source 
fixes #14775
This commit is contained in:
Manu Mtz.-Almeida
2018-08-26 18:52:22 +02:00
parent 771857b1df
commit 8b768fb73d
34 changed files with 122 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/components/nav/nav.tsx
View File

@ -48,7 +48,7 @@ export class Nav implements NavOutlet {
/**
* If the nav should animate the components or not
*/
@Prop({ mutable: true }) animated?: boolean;
@Prop() animated = true;
/** @hidden */
@Prop() delegate?: FrameworkDelegate;
@ -101,9 +101,7 @@ export class Nav implements NavOutlet {
this.mode === 'ios'
);
}
if (this.animated === undefined) {
this.animated = this.config.getBoolean('animate', true);
}
this.ionNavWillLoad.emit();
}
@ -783,15 +781,17 @@ export class Nav implements NavOutlet {
const enteringEl = enteringView.element!;
const leavingEl = leavingView && leavingView.element!;
const animated = this.animated && this.config.getBoolean('animated', true);
const animationOpts: TransitionOptions = {
mode: this.mode,
animated: this.animated,
showGoBack: this.canGoBack(enteringView),
animationCtrl: this.animationCtrl,
progressCallback,
queue: this.queue,
window: this.win,
baseEl: this.el,
progressCallback,
animated,
enteringEl,
leavingEl,