From 48b3243689cc728fcce566b6fc32ab6f134db046 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Thu, 29 Jun 2017 15:23:26 -0500 Subject: [PATCH] fix(navigation): mark as not transitioning on success in addition to '_transitionFinish', provide no mark as not transitioning on success in addition to '_transitionFinish', provide note as to why we want it in both places --- src/navigation/nav-controller-base.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts index d751d668fb..0d387924e2 100644 --- a/src/navigation/nav-controller-base.ts +++ b/src/navigation/nav-controller-base.ts @@ -223,6 +223,8 @@ export class NavControllerBase extends Ion implements NavController { this._init = true; this._trnsId = null; + // ensure we're not transitioning here + this.setTransitioning(false); this._swipeBackCheck(); // let's see if there's another to kick off this._nextTrns(); @@ -749,6 +751,8 @@ export class NavControllerBase extends Ion implements NavController { // it's safe to enable the app again this._app.setEnabled(true); + // mark ourselves as not transitioning - `deepLinker navchange` requires this + // TODO - probably could be resolved in a better way this.setTransitioning(false); if (!this.hasChild() && opts.updateUrl !== false) {