Merge branch 'master' into tag-colour-preview-rebase

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 40ca866c52d65ab7dca633b55a383780ea4186d8..7cbdb1e110b24c843dc8504c505a1363b15e0acb 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -85,8 +85,8 @@ $(document).ready(function () {
 
   $("select#user_auth_provider").on("change", updateAuthUID);
 
-  $("input#user_image").on("change", function () {
-    $("#image_action_new").prop("checked", true);
+  $("input#user_avatar").on("change", function () {
+    $("#avatar_action_new").prop("checked", true);
   });
 
   function enableAuth() {
@@ -125,8 +125,11 @@ $(document).ready(function () {
     $("#contributorTerms").load(url);
   });
 
-  $("#read_tou").on("click", function () { 
-    var agreebtn = document.getElementById('agree');
-    agreebtn.disabled=!this.checked;
+  $("#read_ct").on("click", function () {
+    $("#continue").prop("disabled", !($(this).prop("checked") && $("#read_tou").prop("checked")));
+  });
+
+  $("#read_tou").on("click", function () {
+    $("#continue").prop("disabled", !($(this).prop("checked") && $("#read_ct").prop("checked")));
   });
 });