Add paste event check for submit button validation

diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index 96dc34870a8468ef9869ae5cb891fe9e807d458c..3f312405b509813bb88aa3e418c35a32c05ff75a 100644 (file)
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -8,12 +8,12 @@
 
     <% if controller.model_class.name == 'User' %>
       <%= link_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", setup_user_popup_path,
-        {class: 'btn btn-primary pull-right', :remote => true, 'data-toggle' =>  "modal", 
+        {class: 'btn btn-primary pull-right', :remote => true, 'data-toggle' =>  "modal",
           'data-target' => '#user-setup-modal-window', return_to: request.url}  %>
       <div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
     <% else %>
-      <%= button_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", 
-        { action: 'create', return_to: request.url }, 
+      <%= button_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}",
+        { action: 'create', return_to: request.url },
         { class: 'btn btn-primary pull-right' } %>
     <% end %>
 

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index c075ab5eb4f87f7e8184ad74637ae769a3b2d09b..ac2fd99e703a73989689e91fbf0a0ab5a67eec4c 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -75,12 +75,12 @@
   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 == "" || 
+  if ((email_disabled == false) && (email_value == null || email_value == "" ||
         prefix_value == null || prefix_value == "")) {
     $register.attr('disabled', true);
   }
 
-  $input.keyup(function() {
+  $input.on('keyup paste mouseleave', function() {
     var trigger = false;
 
     var email_disabled = document.forms["setup_form"]["email"].disabled;
@@ -93,7 +93,7 @@
       validEmail = true;
     }
 
-    if ((email_disabled == false) && (!validEmail || email_value == null || 
+    if ((email_disabled == false) && (!validEmail || email_value == null ||
             email_value == "" || prefix_value == null || prefix_value == "")){
       trigger = true;
     }