issue/1582: _canNavigate after router:navigate (#1688)

* issue/1582: _canNavigate after router:navigate * issue/1582: removed variable caching * issue/1582: removed whitespace
adaptlearning · Aug 2, 2017 · 3622a67 · 3622a67
1 parent 0ff7731
commit 3622a67
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/core/js/router.js b/src/core/js/router.js
@@ -47,9 +47,7 @@ define([
         handleRoute: function() {
             var args = this.pruneArguments(arguments);
 
-            var canNavigate = Adapt.router.get('_canNavigate');
-
-            if (canNavigate) {
+            if (Adapt.router.get('_canNavigate')) {
                 // Reset _isCircularNavigationInProgress protection as code is allowed to navigate away
                 this._isCircularNavigationInProgress = false;
             }
@@ -61,7 +59,8 @@ define([
                 Adapt.trigger("router:navigate", args);
             }
 
-            if (canNavigate) {
+            // recheck as _canNavigate can be set to false on router:navigate event
+            if (Adapt.router.get('_canNavigate')) {
 
                 //disable navigation whilst rendering
                 Adapt.router.set('_canNavigate', false, {pluginName: "adapt"});