cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a standard application.js bundle

Browse source 
Include map.js and menu.js in the bundle.
This commit is contained in:
John Firebaugh 2012-08-25 19:41:18 -07:00 • committed by Tom Hughes
parent e2fed14ab8
commit 5aa09fbfd0
8 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/site.js → app/assets/javascripts/application.js
View file

@ -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

2
app/views/browse/_map.html.erb
View file

@ -1,5 +1,3 @@
<%= javascript_include_tag 'map.js' %>
<iframe id="linkloader" style="display: none">
</iframe>

2
app/views/changeset/_map.html.erb
View file

@ -1,5 +1,3 @@
<%= javascript_include_tag 'map.js' %>
<div id="changeset_list_map">
</div>

2
app/views/diary_entry/edit.html.erb
View file

@ -49,8 +49,6 @@
<% zoom = '12' %>
<% end %>
<%= javascript_include_tag 'map.js' %>
<script type="text/javascript">
<!--
var marker;

3
app/views/layouts/_head.html.erb
View file

@ -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)" %>

2
app/views/site/index.html.erb
View file

@ -125,8 +125,6 @@ else
end
%>
<%= javascript_include_tag 'map.js' %>
<%= render :partial => 'resize' %>
<script type="text/javascript">

2
app/views/user/_map.html.erb
View file

@ -13,8 +13,6 @@ else
end
%>
<%= javascript_include_tag 'map.js' %>
<script type="text/javascript">
<!--
var marker;

3
config/environments/production.rb
View file

@ -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 )