diff options
| author | Azul <azul@leap.se> | 2012-12-07 17:26:42 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-07 17:26:42 +0100 |
| commit | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (patch) | |
| tree | 4df73c0a0f37ee9f16cd3f15fc2d23f458ca09ba /users/app/assets/javascripts/users.js.coffee | |
| parent | bc2ead40468f0d9372372f73260d83d30e93bc9a (diff) | |
| parent | bfe61e5132b379461425ce868e980e3a1ea0260a (diff) | |
Merge branch 'feature/email-forwards-for-users'
Diffstat (limited to 'users/app/assets/javascripts/users.js.coffee')
| -rw-r--r-- | users/app/assets/javascripts/users.js.coffee | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee index 76a6d79..0595292 100644 --- a/users/app/assets/javascripts/users.js.coffee +++ b/users/app/assets/javascripts/users.js.coffee @@ -3,7 +3,7 @@ preventDefault = (event) -> srp.session = new srp.Session() srp.signedUp = -> - srp.login + srp.login() srp.loggedIn = -> window.location = '/' @@ -29,7 +29,6 @@ $(document).ready -> $('#new_user').submit srp.signup $('#new_session').submit preventDefault $('#new_session').submit srp.login - $('.user.form.edit').submit srp.update - $('.user.form.edit').submit preventDefault + $('.user.form.change_password').submit srp.update + $('.user.form.change_password').submit preventDefault $('.user.typeahead').typeahead({source: pollUsers}); - |