camelize to afterSignIn and add afterSignOut

This commit is contained in:
Sven Fuchs 2012-10-13 15:02:23 +02:00
parent 2485a7bcb9
commit 4689545547
6 changed files with 9 additions and 7 deletions

View File

@ -41,7 +41,7 @@ Travis.reopen
signOut: -> signOut: ->
@get('auth').signOut() @get('auth').signOut()
@get('router').send('showRoot') @get('router').send('afterSignOut')
receive: -> receive: ->
@store.receive.apply(@store, arguments) @store.receive.apply(@store, arguments)

View File

@ -48,8 +48,7 @@
user = @storeUser(data.user) if data?.user user = @storeUser(data.user) if data?.user
@set('state', if user then 'signed-in' else 'signed-out') @set('state', if user then 'signed-in' else 'signed-out')
@set('user', if user then user else undefined) @set('user', if user then user else undefined)
if Travis.app && (router = Travis.app.get('router')) router.send('afterSignIn') if router = Travis.app?.get('router')
router.send('after_signin')
storeToken: (token) -> storeToken: (token) ->
sessionStorage.setItem('travis.token', token) sessionStorage.setItem('travis.token', token)

View File

@ -147,12 +147,15 @@ Travis.Router = Ember.Router.extend
needsAuth: (path) -> needsAuth: (path) ->
path.indexOf('/profile') == 0 path.indexOf('/profile') == 0
after_signin: -> afterSignIn: ->
after_signin_path = sessionStorage.getItem('travis.after_signin_path') after_signin_path = sessionStorage.getItem('travis.after_signin_path')
sessionStorage.removeItem('travis.after_signin_path') sessionStorage.removeItem('travis.after_signin_path')
@transitionTo('root') @transitionTo('root')
@route(after_signin_path || '/') @route(after_signin_path || '/')
afterSignOut: ->
@route('/')
loading: Ember.Route.extend loading: Ember.Route.extend
routePath: (router, path) -> routePath: (router, path) ->
router.saveLineNumberHash(path) router.saveLineNumberHash(path)

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 @@
26785586 db55d72d