]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: e2fed14)
Use a standard application.js bundle
authorJohn Firebaugh <john.firebaugh@gmail.com>
Sun, 26 Aug 2012 02:41:18 +0000 (19:41 -0700)
committerTom Hughes <tom@compton.nu>
Mon, 27 Aug 2012 19:31:17 +0000 (20:31 +0100)
Include map.js and menu.js in the bundle.

app/assets/javascripts/application.js [moved from app/assets/javascripts/site.js with 99% similarity] patch | blob | history
app/views/browse/_map.html.erb patch | blob | history
app/views/changeset/_map.html.erb patch | blob | history
app/views/diary_entry/edit.html.erb patch | blob | history
app/views/layouts/_head.html.erb patch | blob | history
app/views/site/index.html.erb patch | blob | history
app/views/user/_map.html.erb patch | blob | history
config/environments/production.rb patch | blob | history

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 df56b95bc2bd007c0694a4043f4547aabaa041d9..e40465f06e0d814607ffaeec433553a5b6327635 100644 (file)
--- 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 340e26132bf8e94e7fc6803beab960a271f5535b..6dba6cff3beffea723d1c1e8d7f6f310991128db 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,5 +1,3 @@
-<%= javascript_include_tag 'map.js' %>
-
 <iframe id="linkloader" style="display: none">
 </iframe>
 
diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index e055047a915b71cdeeab6ea9cd8308cdeec16c68..a586811f734687a576078e70168be001ef8e95a0 100644 (file)
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -1,5 +1,3 @@
-<%= javascript_include_tag 'map.js' %>
-
 <div id="changeset_list_map">
 </div>
 
diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index fc34842ad4ad34491d921f17aab5dfda5167b2e6..ef46c63108f85bfcc04a0553a554e9731af623c6 100644 (file)
--- 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' %>
-
 <script type="text/javascript">
   <!--
   var marker;
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 6e2920a7c40a5c0819aa8a01bd1edb9c56f4cae3..133a746a81b0d55a34450f0c4baa15cda4b9e6c6 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,7 +1,6 @@
 <head>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
-  <%= javascript_include_tag "site" %>
-  <%= javascript_include_tag "menu" %>
+  <%= javascript_include_tag "application" %>
   <!--[if lt IE 7]><%= javascript_include_tag "pngfix" %><![endif]--> <!-- thanks, microsoft! -->
   <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %>
   <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %>
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 9b4405feb23dd776b669fe575548c42730fffab3..dc0e02f6faf747ec5397349b433b1f14554d9a90 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -125,8 +125,6 @@ else
 end
 %>
 
-<%= javascript_include_tag 'map.js' %>
-
 <%= render :partial => 'resize' %>
 
 <script type="text/javascript">
diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 94d1411a05f8063b83365796ebd47252f1b34b76..c1ef0c6f05286785f9372e616722e40fa8dfc546 100644 (file)
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -13,8 +13,6 @@ else
 end
 %>
 
-<%= javascript_include_tag 'map.js' %>
-
 <script type="text/javascript">
   <!--
   var marker;
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2b900df88f05371f54a410f90b97deae34331534..334eefd620400d413bf465e86ba3c7853d12536f 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -56,8 +56,7 @@ OpenStreetMap::Application.configure do
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w( map.js menu.js pngfix.js site.js swfobject.js )
-  config.assets.precompile += %w( openlayers.js )
+  config.assets.precompile += %w( pngfix.js swfobject.js )
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( browse.css theme/openstreetmap/style.css )
The OpenStreetMap web site