fixed routing between different types of routes where one was async

Betterment · Feb 23, 2015 · 2ea5bd4 · 2ea5bd4
1 parent 6016bf7
commit 2ea5bd4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/backbone.blazer.js b/backbone.blazer.js
@@ -41,6 +41,8 @@
         handleRoute: function(routeData) {
             var handler = routeData.handler;
 
+            this.currentRoute = handler;
+
             if (_.isString(handler)) {
                 if (_.isFunction(this[handler])) {
                     this[handler].apply(this, routeData.params);
@@ -57,8 +59,6 @@
         _handleBlazerRoute: function(route, routeData) {
             var router = this;
 
-            this.currentRoute = route;
-
             route.trigger('before:execute', routeData);
 
             route.prepare(routeData).then(function() {