summaryrefslogtreecommitdiff
path: root/users/app/assets/javascripts
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-02-26 10:45:52 -0800
committerjessib <jessib@riseup.net>2013-02-26 10:45:52 -0800
commit994f8d23a5a961b8656136eae2aec56204293c52 (patch)
tree09a6cbcd6c4fad8fcf130d6c2d268afe025886ca /users/app/assets/javascripts
parent5dbbf733a6abe809a38667e8b3277fd06db24788 (diff)
parent73e9332dadde9f37a85753faf40b9b6b2d73dd88 (diff)
Merge pull request #28 from leapcode/feature/change_login
Feature/change login
Diffstat (limited to 'users/app/assets/javascripts')
-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 86bacee..a62be6d 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_password').submit srp.update
- $('.user.form.change_password').submit preventDefault
+ $('.user.form.change_login_and_password').submit srp.update
+ $('.user.form.change_login_and_password').submit preventDefault
$('.user.typeahead').typeahead({source: pollUsers});
$('a[data-toggle="tab"]').on('shown', ->
$(ClientSideValidations.selectors.forms).validate()