[ARVADOS] updated: e47ff9c692729800f00347bce614e0be5eda09f3

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_setup_popup.html.erb          |   42 -------------------
 apps/workbench/app/views/users/setup_popup.js.erb  |   43 ++++++++++++++++++++
 apps/workbench/test/integration/users_test.rb      |    4 +-
 3 files changed, 45 insertions(+), 44 deletions(-)

       via  e47ff9c692729800f00347bce614e0be5eda09f3 (commit)
       via  f0fcc404d0870e65764c9039762c3b89f4f44a77 (commit)
      from  c4faff1f289fc91d6dd8bfdf2ed38bd5e71dc2ad (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 e47ff9c692729800f00347bce614e0be5eda09f3
Author: radhika chippada <radhika at curoverse.com>
Date:   Tue Apr 8 12:00:32 2014 -0400

    Move the javascript into a js file instead of using <script> tag in html file.

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index ac2fd99..f7f7914 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -67,45 +67,3 @@
     <% end #form %>
   </div>
 </div>
-
-<script>
-  var $input = $('input:text'),
-  $register = $('#register');
-
-  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 == "")) {
-    $register.attr('disabled', true);
-  }
-
-  $input.on('keyup paste mouseleave', function() {
-    var trigger = false;
-
-    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;
-
-    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;
-    }
-
-    trigger ? $register.attr('disabled', true) : $register.removeAttr('disabled');
-  });
-
-  function reset_form() {
-    $('#email').val("");
-    $('#openid_prefix').val("");
-    $('#repo_name').val("");
-    $('select').val('')
-  }
-
-</script>
diff --git a/apps/workbench/app/views/users/setup_popup.js.erb b/apps/workbench/app/views/users/setup_popup.js.erb
index 77213d4..5671cc2 100644
--- a/apps/workbench/app/views/users/setup_popup.js.erb
+++ b/apps/workbench/app/views/users/setup_popup.js.erb
@@ -1 +1,44 @@
 $("#user-setup-modal-window").html("<%= escape_javascript(render partial: 'setup_popup') %>");
+
+// disable the submit button on load
+var $input = $('input:text'),
+$register = $('#register');
+
+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 == "")) {
+  $register.attr('disabled', true);
+}
+
+// capture events to enable submit button when applicable
+$input.on('keyup paste mouseleave', function() {
+  var trigger = false;
+
+  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;
+
+  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;
+  }
+
+  trigger ? $register.attr('disabled', true) : $register.removeAttr('disabled');
+});
+
+// reset form input fields, for the next time around
+function reset_form() {
+  $('#email').val("");
+  $('#openid_prefix').val("");
+  $('#repo_name').val("");
+  $('select').val('')
+}

commit f0fcc404d0870e65764c9039762c3b89f4f44a77
Author: radhika chippada <radhika at curoverse.com>
Date:   Tue Apr 8 10:40:31 2014 -0400

    Remove trailing white spaces.

diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index 2472ec8..9ee12d8 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -46,7 +46,7 @@ class UsersTest < ActionDispatch::IntegrationTest
     assert page.has_text? 'zzzzz-tpzed-d9tiejq69daie8f'
 
     click_link 'Add a new user'
-    
+
     sleep(0.1)
     popup = page.driver.browser.window_handles.last
     page.within_window popup do
@@ -57,7 +57,7 @@ class UsersTest < ActionDispatch::IntegrationTest
     end
 
     sleep(0.1)
-    
+
     # verify that the new user showed up in the users page
     assert page.has_text? 'foo at example.com'
 

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


hooks/post-receive
--