Skip to content
Browse files

Only set lastRouteContext when route is not triggered

  • Loading branch information...
1 parent 17fb9f3 commit 1b671637319537b5cb1b41472f0a8e1c9f9a401d Dominik Guzei committed Feb 1, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 app/assets/javascripts/app/controllers/statechartController.js.coffee
View
3 app/assets/javascripts/app/controllers/statechartController.js.coffee
@@ -6,7 +6,6 @@ App.controllers.statechartController = SC.Object.create(SC.StatechartDelegate, {
lastRouteContext: null
statechartShouldStateHandleTriggeredRoute: (statechart, state, context) ->
- @set 'lastRouteContext', context
lastCheckedState = state
shouldTrigger = true
@@ -16,7 +15,7 @@ App.controllers.statechartController = SC.Object.create(SC.StatechartDelegate, {
if lastCheckedState.beforeFilter
shouldTrigger = lastCheckedState.beforeFilter()
if not shouldTrigger
- SC.routes.set 'location', null
+ @set 'lastRouteContext', context
break
lastCheckedState = lastCheckedState.get 'parentState'

0 comments on commit 1b67163

Please sign in to comment.
Something went wrong with that request. Please try again.