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

fix(loading): fix animation for loading the first time

Browse Source 
references #5426
This commit is contained in:
Brandy Carney
2016-04-05 14:08:30 -04:00
parent 41a6524855
commit 6cd90eed3c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ export class NavController extends Ion {
provide(NavController, {useValue: this})
]);
}
setPortal(val: Portal) {
this._portal = val;
}
@ -439,8 +439,8 @@ export class NavController extends Ion {
keyboardClose: false,
direction: 'back',
animation: enteringView.getTransitionName('back')
});
});
if (enteringView.usePortal && this._portal) {
this._portal.present(enteringView);
return;
@ -1098,7 +1098,9 @@ export class NavController extends Ion {
this._trans && this._trans.destroy();
this._trans = transAnimation;
if (opts.animate === false) {
// Portal elements should always animate
// so ignore this if it is a portal
if (opts.animate === false && this._portal) {
// force it to not animate the elements, just apply the "to" styles
transAnimation.duration(0);
}
@ -1259,7 +1261,7 @@ export class NavController extends Ion {
// see if we should add the swipe back gesture listeners or not
this._sbCheck();
if (this._portal) {
this._portal._views.forEach(view => {
if (view.data && view.data.dismissOnPageChange) {