Actually fix profile view when reloading page - no need to redirect
This commit is contained in:
parent
e561d7e145
commit
6a487c8fd8
|
@ -4,9 +4,5 @@ Travis.AccountsController = Ember.ArrayController.extend
|
||||||
init: ->
|
init: ->
|
||||||
@_super()
|
@_super()
|
||||||
|
|
||||||
# content: (->
|
|
||||||
# Travis.Account.find()
|
|
||||||
# ).property()
|
|
||||||
|
|
||||||
findByLogin: (login) ->
|
findByLogin: (login) ->
|
||||||
@find (account) -> account.get('login') == 'login'
|
@find (account) -> account.get('login') == login
|
||||||
|
|
|
@ -214,7 +214,25 @@ Travis.Router = Ember.Router.extend
|
||||||
router.send 'showProfile'
|
router.send 'showProfile'
|
||||||
|
|
||||||
deserialize: (router, params) ->
|
deserialize: (router, params) ->
|
||||||
router.get('accountsController').findByLogin(params.login)
|
controller = router.get('accountsController')
|
||||||
|
|
||||||
|
unless controller.get 'content'
|
||||||
|
controller.set('content', Travis.Account.find())
|
||||||
|
|
||||||
|
account = controller.findByLogin(params.login)
|
||||||
|
|
||||||
|
if account
|
||||||
|
account
|
||||||
|
else
|
||||||
|
deferred = $.Deferred()
|
||||||
|
|
||||||
|
observer = ->
|
||||||
|
if account = controller.findByLogin(params.login)
|
||||||
|
controller.removeObserver 'content.length', observer
|
||||||
|
deferred.resolve account
|
||||||
|
controller.addObserver 'content.length', observer
|
||||||
|
|
||||||
|
deferred.promise()
|
||||||
|
|
||||||
serialize: (router, account) ->
|
serialize: (router, account) ->
|
||||||
if account
|
if account
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
075ed744
|
bb949c93
|
Loading…
Reference in New Issue
Block a user