From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Feb 2017 22:48:36 +0000 (+0000)
Subject: Remove inline javascript from user views
X-Git-Tag: live~3522
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d13348c0ea27cdb33153564aacf3130b0432157c?hp=-c

Remove inline javascript from user views
---

d13348c0ea27cdb33153564aacf3130b0432157c
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 10b7cfdb8..697017697 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -38,6 +38,8 @@ OSM = {
   OPEN_NOTE_MARKER:        <%= image_path("open_note_marker.png").to_json %>,
   CLOSED_NOTE_MARKER:      <%= image_path("closed_note_marker.png").to_json %>,
 
+  SEARCHING:               <%= image_path("searching.gif").to_json %>,
+
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
 
diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 7e7e7c803..44872a78c 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -103,4 +103,20 @@ $(document).ready(function () {
   } else {
     enableAuth();
   }
+
+  $("#user_all").change(function () {
+    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
+  });
+
+  $("#content.user_confirm").each(function () {
+    $(this).hide();
+    $(this).find("#confirm").submit();
+  });
+
+  $("input[name=legale]").change(function () {
+    var url = $(this).data("url");
+
+    $("#contributorTerms").html("<img src='" + OSM.SEARCHING + "' />");
+    $("#contributorTerms").load(url);
+  });
 });
diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb
index 9fc33094e..f52098289 100644
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -4,9 +4,11 @@
 <% end %>
 
 <% if params[:confirm_string] %>
-  <script>
-  $("#content").hide();
-  </script>
+  <% content_for :head do %>
+    <%= javascript_include_tag "user" %>
+  <% end %>
+
+  <% content_for(:content_class) { "user_confirm" } %>  
 
   <p><%= t 'user.confirm.press confirm button' %></p>
 
@@ -15,10 +17,6 @@
     <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
     <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">
   <% end %>
-
-  <script>
-  $("#confirm").submit();
-  </script>
 <% else %>
   <h1>
     <%= t "user.confirm.introduction_1" %>
diff --git a/app/views/user/confirm_email.html.erb b/app/views/user/confirm_email.html.erb
index 1170631ca..1791cfc73 100644
--- a/app/views/user/confirm_email.html.erb
+++ b/app/views/user/confirm_email.html.erb
@@ -1,6 +1,8 @@
-<script>
-$("#content").hide();
-</script>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for(:content_class) { "user_confirm" } %>  
 
 <% content_for :heading do %>
   <h1><%= t 'user.confirm_email.heading' %></h1>
@@ -12,7 +14,3 @@ $("#content").hide();
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
   <input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">
 <% end %>
-
-<script>
-$("#confirm").submit();
-</script>
diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index 93839cbe8..fcd0c41fc 100644
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,5 +1,9 @@
 <% @title = t('user.list.title') %>
 
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
 <% content_for :heading do %>
   <h1><%= t('user.list.heading') %></h1>
 <% end %>
@@ -34,12 +38,6 @@
       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>
-
-    <script type="text/javascript">
-     $("#user_all").change(function () {
-       $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
-     });
-    </script>
   <% end %>
 <% else %>
   <p><%= t "user.list.empty" %></p>
diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 47e2f8b54..3d8cb22f7 100644
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,3 +1,7 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
 <% content_for :heading do %>
   <h1><%= t 'user.terms.heading' %></h1>
   <div class='header-illustration new-user-terms'></div>
@@ -13,15 +17,9 @@
     <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
       <div class="form-row">
         <label for="legale_<%= legale %>">
-          <%= radio_button_tag 'legale', legale, @legale == legale %>
+          <%= radio_button_tag 'legale', legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
           <%= t('user.terms.legale_names.' + name) %>
         </label>
-        <script>
-          $("#legale_<%= legale %>").change(function () {
-            $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
-            $("#contributorTerms").load("<%= url_for :legale => legale %>");
-          });
-        </script>
       </div>
     <% end %>
   </div>