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

fix(nav): clickblock is disabled longer

Browse Source 
fixes #8713
This commit is contained in:
Manu Mtz.-Almeida
2016-10-16 02:52:15 +02:00
parent ba557acb4f
commit eb317d410c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,7 +621,7 @@ export class NavControllerBase extends Ion implements NavController {
if (duration > DISABLE_APP_MINIMUM_DURATION) { if (duration > DISABLE_APP_MINIMUM_DURATION) {
// if this transition has a duration and this is the root transition // if this transition has a duration and this is the root transition
// then set that the app is actively disabled // then set that the app is actively disabled
this._app.setEnabled(false, duration); this._app.setEnabled(false, duration + ACTIVE_TRANSITION_OFFSET);
} }
// cool, let's do this, start the transition // cool, let's do this, start the transition
@ -802,7 +802,9 @@ export class NavControllerBase extends Ion implements NavController {
} }
swipeBackStart() { swipeBackStart() {
if (this.isTransitioning() || this._queue.length > 0) return; if (this.isTransitioning() || this._queue.length > 0) {
return;
}
// default the direction to "back"; // default the direction to "back";
const opts: NavOptions = { const opts: NavOptions = {
@ -822,7 +824,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); this.setTransitioning(true, ACTIVE_TRANSITION_DEFAULT);
// set the transition animation's progress // set the transition animation's progress
this._sbTrns.progressStep(stepValue); this._sbTrns.progressStep(stepValue);