From: Tom Hughes <tom@compton.nu>
Date: Sat, 12 Dec 2015 11:42:36 +0000 (+0000)
Subject: Remove inline javascript from login page
X-Git-Tag: live~3979
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9dd5dabf869e76cc00698e12b284400e570098c0?hp=8c38faa90e53dfdb7a23cb3b03cd063314aa8fda

Remove inline javascript from login page
---

diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
new file mode 100644
index 000000000..755c3bf65
--- /dev/null
+++ b/app/assets/javascripts/login.js
@@ -0,0 +1,18 @@
+$(document).ready(function() {
+  // Preserve location hash in referer
+  if (window.location.hash) {
+    $("#referer").val($("#referer").val() + window.location.hash);
+  }
+
+  // Add click handler to show OpenID field
+  $("#openid_open_url").click(function() {
+    $("#openid_url").val("http://");
+    $("#login_auth_buttons").hide();
+    $("#login_openid_url").show();
+    $("#login_openid_submit").show();
+  });
+
+  // Hide OpenID field for now
+  $("#login_openid_url").hide();
+  $("#login_openid_submit").hide();
+});
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index ded03318f..3c9557ae0 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,8 +1,12 @@
-<div id="login_login">
+<% content_for :head do %>
+  <%= javascript_include_tag "login" %>
+<% end %>
+
 <% content_for :heading do %>
   <h1><%= t 'user.login.heading' %></h1>
 <% end %>
 
+<div id="login_login">
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag('referer', h(params[:referer])) %>
 
@@ -76,22 +80,3 @@
   <% end %>
 
 </div>
-
-<script type="text/javascript">
-$(document).ready(function() {
-  // Preserve location hash in referer
-  if (window.location.hash) {
-    $('#referer').val($('#referer').val() + window.location.hash);
-  }
-
-  $("#openid_open_url").click(function() {
-    $("#openid_url").val("http://");
-    $("#login_auth_buttons").hide();
-    $("#login_openid_url").show();
-    $("#login_openid_submit").show();
-  });
-
-  $("#login_openid_url").hide();
-  $("#login_openid_submit").hide();
-});
-</script>