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

fix(angular): no animate in browser nav

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-11-29 01:26:40 +01:00
committed by Manu MA
parent 194667c62a
commit 276c883493
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
angular/src/providers/nav-controller.ts
View File

@ -10,7 +10,8 @@ export class NavController {
private direction: NavDirection = DEFAULT_DIRECTION;
private animated = DEFAULT_ANIMATED;
private guessDirection: NavDirection = 'root';
private guessDirection: NavDirection = 'forward';
private guessAnimation = false;
private lastNavId = -1;
constructor(
@ -22,6 +23,7 @@ export class NavController {
router.events.subscribe(ev => {
if (ev instanceof NavigationStart) {
const id = (ev.restoredState) ? ev.restoredState.navigationId : ev.id;
this.guessAnimation = !ev.restoredState;
this.guessDirection = id < this.lastNavId ? 'back' : 'forward';
this.lastNavId = this.guessDirection === 'forward' ? ev.id : id;
}
@ -77,8 +79,8 @@ export class NavController {
if (this.direction === 'auto') {
direction = this.guessDirection;
console.log('guessed', direction);
animated = direction !== 'root';
animated = this.guessAnimation;
console.debug('[nav-controller] guessed nav direction', direction, 'animated', animated);
} else {
animated = this.animated;
direction = this.direction;