Add email format validation to the input text field in the setup modal.

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index aed57da978c70317de1d8a54c61c484723eab0c0..90cab2cc9c206bd26690673158c5425fe5e30446 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -75,7 +75,8 @@
   var email_disabled = document.forms["setup_form"]["email"].disabled;
   var email_value = document.forms["setup_form"]["email"].value;
   var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
-  if ((email_disabled == false) && (email_value == null || email_value == "" || prefix_value == null || prefix_value == "")) {
+  if ((email_disabled == false) && (email_value == null || email_value == "" || 
+        prefix_value == null || prefix_value == "")) {
     $register.attr('disabled', true);
   }
 
@@ -85,7 +86,15 @@
     var email_disabled = document.forms["setup_form"]["email"].disabled;
     var email_value = document.forms["setup_form"]["email"].value;
     var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
-    if ((email_disabled == false) && (email_value == null || email_value == "" || prefix_value == null || prefix_value == "")) {
+
+    var emailRegExp = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/;
+    var validEmail = false;
+    if (emailRegExp.test(email_value )) {
+      validEmail = true;
+    }
+
+    if ((email_disabled == false) && (!validEmail || email_value == null || 
+            email_value == "" || prefix_value == null || prefix_value == "")){
       trigger = true;
     }