diff --git a/resources/static/dialog/controllers/checkregistration_controller.js b/resources/static/dialog/controllers/checkregistration_controller.js index b19fa0be985cd6dbf330eed4b456fae39e5fb7a1..5231cf6cf96e1672d9663fce2d84d9b7689837a4 100644 --- a/resources/static/dialog/controllers/checkregistration_controller.js +++ b/resources/static/dialog/controllers/checkregistration_controller.js @@ -65,7 +65,9 @@ me.close("auth", { email: me.email }); } }, me.getErrorDialog(BrowserID.Errors.registration)); - } + }, + + " }); diff --git a/resources/static/dialog/controllers/pickemail_controller.js b/resources/static/dialog/controllers/pickemail_controller.js index e60ca3099107fb7b92489554deb4d9005513f6d8..3a79c113ce0c4f9d1283c5e68db9a3288ac30046 100644 --- a/resources/static/dialog/controllers/pickemail_controller.js +++ b/resources/static/dialog/controllers/pickemail_controller.js @@ -42,6 +42,7 @@ user = bid.User, errors = bid.Errors, storage = bid.Storage, + helpers = bid.Helpers, dom = bid.DOM, body = $("body"), animationComplete = body.innerWidth() < 640, @@ -150,12 +151,12 @@ } function addEmail(element, event) { - var email = dom.getInner("#newEmail"), + var email = helpers.getAndValidateEmail("#newEmail"), self=this; cancelEvent(event); - if (!bid.Validation.email(email)) { + if (!email) { return; } diff --git a/resources/static/dialog/dialog.js b/resources/static/dialog/dialog.js index 319fa4cca385ae40e0e92c371e2207215072fdaa..6dd10f88ae3d5ee098d620a31554016abc603dc1 100644 --- a/resources/static/dialog/dialog.js +++ b/resources/static/dialog/dialog.js @@ -61,6 +61,7 @@ steal '../shared/screens', '../shared/tooltip', '../shared/validation', + '../shared/helpers', '../shared/browser-support', '../shared/browserid-extensions', '../shared/network',