Merge branch 'pickemail_newemail_whitespace' into dev

mozilla · Nov 16, 2011 · 8bb9eac · 8bb9eac
2 parents 46e4664 + 333adbf
commit 8bb9eac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -61,6 +61,7 @@ steal
                '../shared/screens',
                '../shared/tooltip',
                '../shared/validation',
+               '../shared/helpers',
                '../shared/browser-support',
                '../shared/browserid-extensions',
                '../shared/network',