From 4cc2b63d5c38158e6beb114147be723425ec412e Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 2 Oct 2013 11:03:20 -0700
Subject: [PATCH] Factor javascript include tag to layout

---
 app/views/browse/changeset.html.erb        | 1 -
 app/views/browse/node.html.erb             | 1 -
 app/views/browse/node_history.html.erb     | 1 -
 app/views/browse/note.html.erb             | 1 -
 app/views/browse/relation.html.erb         | 1 -
 app/views/browse/relation_history.html.erb | 1 -
 app/views/browse/way.html.erb              | 1 -
 app/views/browse/way_history.html.erb      | 1 -
 app/views/changeset/list.html.erb          | 1 -
 app/views/layouts/map.html.erb             | 4 ++++
 app/views/site/export.html.erb             | 4 ----
 app/views/site/index.html.erb              | 4 ----
 12 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 36d8734a1..05e3d4391 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,6 +1,5 @@
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index deae710db..92ccb775d 100644
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index 98b6745e4..6f1a3f0b7 100644
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 90c1f358d..8ccd525a3 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,6 +1,5 @@
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 9d1cee107..1e3af0df2 100644
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index c22df2f1e..5f419e6c7 100644
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index f6e8b7f01..e5493d3f9 100644
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index 8bc50e307..7fe4feeb2 100644
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -5,7 +5,6 @@
 
 <% content_for :head do %>
   <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 19707cd3f..965b66484 100644
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,5 +1,4 @@
 <% content_for :head do -%>
-  <%= javascript_include_tag "index" %>
   <%= javascript_include_tag "changeset" %>
 
   <% unless params[:friends] or params[:nearby] -%>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index cedfdb9c2..09c7d0d8e 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -1,3 +1,7 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "index" %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
     <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 0cabc0c2d..63afa3dd0 100644
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "index" %>
-<% end %>
-
 <% content_for :sidebar do %>
   <h2><%= t 'export.start_rjs.export' %></h2>
   <%= form_tag :controller => "export", :action => "finish" do %>
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 204adb1fb..a98810172 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "index" %>
-<% end %>
-
 <% content_for :sidebar do %>
   <h2>
     <%= t 'layouts.intro_header' %>
-- 
2.43.2