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

fix(nav): transitioning state is a boolean not a timer

Browse Source 
long async promises in canLeave / canEnter can lead to a false negative of isTransitioning()
It is key for the internal consistency of NavController to always know the correct state
This commit is contained in:
Manu Mtz.-Almeida
2016-11-04 20:16:56 +01:00
parent beab06f7ce
commit 63d495ae43
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/navigation/nav-controller-base.ts
View File

@ -34,7 +34,7 @@ export class NavControllerBase extends Ion implements NavController {
_sbThreshold: number; _sbThreshold: number;
_sbTrns: Transition; _sbTrns: Transition;
_trnsId: number = null; _trnsId: number = null;
_trnsTm: number = 0; _trnsTm: boolean = false;
_viewport: ViewContainerRef; _viewport: ViewContainerRef;
_views: ViewController[] = []; _views: ViewController[] = [];
@ -597,7 +597,7 @@ export class NavControllerBase extends Ion implements NavController {
const duration = transition.getDuration(); const duration = transition.getDuration();
// set that this nav is actively transitioning // set that this nav is actively transitioning
this.setTransitioning(true, duration); this.setTransitioning(true);
if (transition.isRoot()) { if (transition.isRoot()) {
// this is the top most, or only active transition, so disable the app // this is the top most, or only active transition, so disable the app
@ -883,7 +883,7 @@ export class NavControllerBase extends Ion implements NavController {
if (this._sbTrns && this._sbGesture) { if (this._sbTrns && this._sbGesture) {
// continue to disable the app while actively dragging // continue to disable the app while actively dragging
this._app.setEnabled(false, ACTIVE_TRANSITION_DEFAULT); this._app.setEnabled(false, ACTIVE_TRANSITION_DEFAULT);
this.setTransitioning(true, ACTIVE_TRANSITION_DEFAULT); this.setTransitioning(true);
// set the transition animation's progress // set the transition animation's progress
this._sbTrns.progressStep(stepValue); this._sbTrns.progressStep(stepValue);
@ -933,15 +933,11 @@ export class NavControllerBase extends Ion implements NavController {
} }
isTransitioning(): boolean { isTransitioning(): boolean {
if (this._trnsTm === 0) { return this._trnsTm;
return false;
}
// using a timestamp instead of boolean incase something goes wrong
return (this._trnsTm > Date.now());
} }
setTransitioning(isTransitioning: boolean, durationPadding: number = ACTIVE_TRANSITION_DEFAULT) { setTransitioning(isTransitioning: boolean) {
this._trnsTm = (isTransitioning ? (Date.now() + durationPadding + ACTIVE_TRANSITION_OFFSET) : 0); this._trnsTm = isTransitioning;
} }
getActive(): ViewController { getActive(): ViewController {