summaryrefslogtreecommitdiff
path: root/users/app/assets
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-02-26 13:25:25 -0800
committerjessib <jessib@leap.se>2013-02-26 13:25:25 -0800
commitc97f356ae8ce07dab04b81d0d0160f3e5fd96f6d (patch)
tree73e5d68347d5aa839b3b63eaf3eefcc49e4d937d /users/app/assets
parenta7722e57ee6e10b578457e880f04349f7f9a0f66 (diff)
parent97fe2b4d19edacf2ea67c7efcfbec50feca305b0 (diff)
Merge branch 'master' into feature/limit_usernames
Diffstat (limited to 'users/app/assets')
-rw-r--r--users/app/assets/javascripts/users.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
index a62be6d..955556c 100644
--- a/users/app/assets/javascripts/users.js.coffee
+++ b/users/app/assets/javascripts/users.js.coffee
@@ -37,8 +37,8 @@ $(document).ready ->
$('#new_user').submit srp.signup
$('#new_session').submit preventDefault
$('#new_session').submit srp.login
- $('.user.form.change_login_and_password').submit srp.update
- $('.user.form.change_login_and_password').submit preventDefault
+ $('.user.form.update_login_and_password').submit srp.update
+ $('.user.form.update_login_and_password').submit preventDefault
$('.user.typeahead').typeahead({source: pollUsers});
$('a[data-toggle="tab"]').on('shown', ->
$(ClientSideValidations.selectors.forms).validate()