Fix back button

Repo.bySlug can return loaded items if they were loaded previously,
that's why it will not trigger isLoaded property change.
This commit is contained in:
Piotr Sarnacki 2012-10-10 19:07:27 +02:00
parent b142d3cdcf
commit ed2ddc04f6
4 changed files with 8 additions and 5 deletions

View File

@ -92,7 +92,6 @@ resolvePath = (manager, path) ->
return b.get('route.length') - a.get('route.length')
match = null
console.log(childStates.map( (s) -> s.get('route')))
state = childStates.find (state) ->
matcher = state.get('routeMatcher')
if match = matcher.match(path)
@ -161,6 +160,7 @@ Travis.Router = Ember.Router.extend
router.route('/')
root: Ember.Route.extend
route: '/'
authenticate: (->)
loading: Ember.State.extend()
@ -271,7 +271,10 @@ Travis.Router = Ember.Router.extend
repos.removeObserver 'isLoaded', observer
deferred.resolve repos.objectAt(0)
repos.addObserver 'isLoaded', observer
if repos.length
deferred.resolve repos[0]
else
repos.addObserver 'isLoaded', observer
deferred.promise()

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
a3466403
9cf466ba