X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c57d2b29fc1f4647b460b6b74d072c409932e3f2..ff7244d08550b3e151c24a87f78002b0c016d78a:/Vendorfile?ds=inline diff --git a/Vendorfile b/Vendorfile index 361f2c843..d66dd80d8 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,13 +11,18 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'https://unpkg.com/leaflet@1.0.3/dist/leaflet-src.js' - file 'leaflet.css', 'https://unpkg.com/leaflet@1.0.3/dist/leaflet.css' + file 'leaflet.js', 'https://unpkg.com/leaflet@1.2.0/dist/leaflet-src.js' + file 'leaflet.css', 'https://unpkg.com/leaflet@1.2.0/dist/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "https://unpkg.com/leaflet@1.0.3/dist/images/#{image}" + file "images/#{image}", "https://unpkg.com/leaflet@1.2.0/dist/images/#{image}" + end + + from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.2.1' do + file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js' + file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css' end from 'git://github.com/kajic/leaflet-locationfilter.git' do @@ -26,7 +31,7 @@ folder 'vendor/assets' do folder 'img', 'src/img' end - from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.54.0' do + from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.62.0' do file 'leaflet.locate.js', 'src/L.Control.Locate.js' end @@ -49,7 +54,6 @@ 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' folder 'iD/mapillary-js', 'dist/mapillary-js' file 'iD.css.erb', 'dist/iD.css' do |path| @@ -58,14 +62,6 @@ folder 'vendor/assets' do 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' end end