OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix sign in,out
[pettanr/pettanr.git]
/
app
/
assets
/
javascripts
/
views
/
layout.js.coffee
diff --git
a/app/assets/javascripts/views/layout.js.coffee
b/app/assets/javascripts/views/layout.js.coffee
index
acca855
..
8b57faf
100644
(file)
--- a/
app/assets/javascripts/views/layout.js.coffee
+++ b/
app/assets/javascripts/views/layout.js.coffee
@@
-162,8
+162,11
@@
class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base
# initial page
\r
super()
\r
\r
# initial page
\r
super()
\r
\r
- sign_in: () ->
\r
-
\r
+ sign_in: (attr) ->
\r
+ @user = new Pettanr.User.Session(attr)
\r
+ @listenTo(@user, 'sign_in:success', @sign_in_success)
\r
+ @listenTo(@user, 'sign_in:fail', @sign_in_fail)
\r
+ @user.save({})
\r
\r
sign_in_success: (user, response) ->
\r
super(user, response)
\r
\r
sign_in_success: (user, response) ->
\r
super(user, response)
\r
@@
-176,8
+179,8
@@
class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base
\r
sign_in_fail: (user, response) ->
\r
super(user, response)
\r
\r
sign_in_fail: (user, response) ->
\r
super(user, response)
\r
- @header
_router.navigate('users/guest'
)
\r
- @
local_router.navigate('user_seeeions/new'
)
\r
+ @header
.fire({controller: 'users', action: 'guest'}
)
\r
+ @
body.fire({controller: 'user_sessions', action: 'new'}
)
\r
\r
sign_out: () ->
\r
@header.fire({controller: 'users', action: 'sign_out'})
\r
\r
sign_out: () ->
\r
@header.fire({controller: 'users', action: 'sign_out'})
\r
@@
-187,10
+190,10
@@
class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base
@global_router.navigate('')
\r
## navigate users/guest
\r
## callback from fire to refresh_header
\r
@global_router.navigate('')
\r
## navigate users/guest
\r
## callback from fire to refresh_header
\r
-
#@header_router.navigate('users/guest'
)
\r
+
@header.fire({controller: 'users', action: 'guest'}
)
\r
## navigate sign in form
\r
## callback from fire to refresh_body
\r
## navigate sign in form
\r
## callback from fire to refresh_body
\r
-
#@local_router.navigate('user_sessions/new'
)
\r
+
@body.fire({controller: 'user_sessions', action: 'new'}
)
\r
\r
sign_out_fail: (user, response) ->
\r
super(user, response)
\r
\r
sign_out_fail: (user, response) ->
\r
super(user, response)
\r