[ARVADOS] updated: cd5e5afa6a37320a2d8f3f01e725bc7b18f800a0

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_setup_popup.html.erb          |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

       via  cd5e5afa6a37320a2d8f3f01e725bc7b18f800a0 (commit)
      from  ac5cd5913a208c463206d2fa6cf62e42148682a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cd5e5afa6a37320a2d8f3f01e725bc7b18f800a0
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Fri Apr 4 15:45:53 2014 -0400

    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 aed57da..90cab2c 100644
--- 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;
     }
 

-----------------------------------------------------------------------


hooks/post-receive
--