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

test(nav): pushing/pop pages from lifecycle events

Browse Source 
references #8510
This commit is contained in:
Manu Mtz.-Almeida
2016-10-08 18:11:57 +02:00
parent c65f936952
commit 88da70c386
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -623,7 +623,7 @@ export class NavControllerBase extends Ion implements NavController {
const duration = trns.getDuration();
// set that this nav is actively transitioning
this.setTransitioning(true, duration + ACTIVE_TRANSITION_OFFSET);
this.setTransitioning(true, duration);
if (!trns.parent) {
// this is the top most, or only active transition, so disable the app
@ -872,7 +872,7 @@ export class NavControllerBase extends Ion implements NavController {
}
setTransitioning(isTransitioning: boolean, durationPadding: number = 2000) {
this._trnsTm = (isTransitioning ? Date.now() + durationPadding : 0);
this._trnsTm = (isTransitioning ? (Date.now() + durationPadding + ACTIVE_TRANSITION_OFFSET) : 0);
}
getActive() {
@ -959,4 +959,4 @@ let ctrlIds = -1;
const DISABLE_APP_MINIMUM_DURATION = 64;
const ACTIVE_TRANSITION_MAX_TIME = 5000;
const ACTIVE_TRANSITION_OFFSET = 200;
const ACTIVE_TRANSITION_OFFSET = 400;