diff options
| author | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
| commit | e1a004e2b24c2c235452469abfefa033e24435b2 (patch) | |
| tree | a4b1c89a5aa4d5ccb3c17521499c999dedd5842d /users/app/assets | |
| parent | 4793c2b770fcb018303b7ab226b75cc218364327 (diff) | |
| parent | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff) | |
Merge branch 'master' into help_develop
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
Diffstat (limited to 'users/app/assets')
| -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}); - |