diff options
author | Azul <azul@leap.se> | 2012-11-22 16:22:49 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-11-22 16:22:49 +0100 |
commit | fb791b200ee4da1b6a2f4e3121cb26196e28c953 (patch) | |
tree | d71fa9065faec5f1bb584e18e45583b393bcd429 /users/app/assets/javascripts | |
parent | 13f53593551549d8e95e382fd42a92efc170943d (diff) | |
parent | ec87ccfa185a4c063386d385de7af15f993b77d8 (diff) |
Merge branch 'feature/error-messages-on-login' into develop
Diffstat (limited to 'users/app/assets/javascripts')
m--------- | users/app/assets/javascripts/srp | 0 | ||||
-rw-r--r-- | users/app/assets/javascripts/users.js.coffee | 26 |
2 files changed, 16 insertions, 10 deletions
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp -Subproject efac662cdf31bc4b61ffb97b8c398e22a86c364 +Subproject 076d6e251e4caf826787d87b11434e535960455 diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee index ab437f6..d0ec32f 100644 --- a/users/app/assets/javascripts/users.js.coffee +++ b/users/app/assets/javascripts/users.js.coffee @@ -27,21 +27,27 @@ validOrAbort = (event) -> abortIfErrors() -signup = (event) -> - srp = new SRP(jqueryRest()) - srp.register -> - window.location = '/' -login = (event) -> - srp = new SRP(jqueryRest()) - srp.identify -> - window.location = '/' +srp.session = new srp.Session() +srp.signedUp = -> + window.location = '/' +srp.loggedIn = -> + window.location = '/' + +srp.error = (message) -> + if $.isPlainObject(message) && message.errors + for field, error of message.errors + element = $('form input[name="session['+field+']"]') + next unless element + element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false) + else + alert(message) $(document).ready -> $('#new_user').submit preventDefault $('#new_user').submit validOrAbort - $('#new_user').submit signup + $('#new_user').submit srp.signup $('#new_session').submit preventDefault - $('#new_session').submit login + $('#new_session').submit srp.login |