From: John Firebaugh Date: Sun, 26 Aug 2012 02:41:18 +0000 (-0700) Subject: Use a standard application.js bundle X-Git-Tag: live~5406 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5aa09fbfd069faf1eb04d4be201a6a1f1eca6cd9 Use a standard application.js bundle Include map.js and menu.js in the bundle. --- diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/application.js similarity index 99% rename from app/assets/javascripts/site.js rename to app/assets/javascripts/application.js index df56b95bc..e40465f06 100644 --- a/app/assets/javascripts/site.js +++ b/app/assets/javascripts/application.js @@ -7,6 +7,8 @@ //= require globals //= require browse //= require export +//= require map +//= require menu /* * Called as the user scrolls/zooms around to aniplate hrefs of the diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb index 340e26132..6dba6cff3 100644 --- a/app/views/browse/_map.html.erb +++ b/app/views/browse/_map.html.erb @@ -1,5 +1,3 @@ -<%= javascript_include_tag 'map.js' %> - diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb index e055047a9..a586811f7 100644 --- a/app/views/changeset/_map.html.erb +++ b/app/views/changeset/_map.html.erb @@ -1,5 +1,3 @@ -<%= javascript_include_tag 'map.js' %> -
diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb index fc34842ad..ef46c6310 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -49,8 +49,6 @@ <% zoom = '12' %> <% end %> -<%= javascript_include_tag 'map.js' %> -