X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..224252fd838abfd7b1ec004080776f15a59d29f9:/Vendorfile diff --git a/Vendorfile b/Vendorfile index 097f557aa..30ccee441 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,13 +11,13 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet-src.js' - file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css' + file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet-src.js' + file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.3/images/#{image}" + file "images/#{image}", "http://cdn.leafletjs.com/leaflet/v0.7.7/images/#{image}" end from 'git://github.com/kajic/leaflet-locationfilter.git' do @@ -49,9 +49,22 @@ folder 'vendor/assets' do from 'git://github.com/openstreetmap/iD', :branch => 'release' do folder 'iD/img', 'dist/img' folder 'iD/locales', 'dist/locales' + folder 'iD/traffico', 'dist/traffico' + file 'iD.css.erb', 'dist/iD.css' do |path| - rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') } + rewrite(path) do |content| + content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') + end + end + + file 'iD/traffico/stylesheets/traffico.css.erb', 'dist/traffico/stylesheets/traffico.css' do |path| + rewrite(path) do |content| + content.gsub(/url\("?\.\.\/([^#?")]+)([^"]*)"?\)/, 'url(<%= asset_path("iD/traffico/\1") %>\2)') + end end + + File.delete('vendor/assets/iD/iD/traffico/stylesheets/traffico.css') + file 'iD.js', 'dist/iD.js' file 'presets.js', 'dist/presets.js' file 'imagery.js', 'dist/imagery.js'