X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/860887de5272c3e2a39cb7e0c9db6f0acba1b4c6..32c3000af7c2c4016b75abf5a396262e28aabd72:/Vendorfile?ds=sidebyside diff --git a/Vendorfile b/Vendorfile index 30ccee441..f940b9ece 100644 --- a/Vendorfile +++ b/Vendorfile @@ -5,19 +5,19 @@ folder 'vendor/assets' do file 'jquery.simulate.js', 'https://raw.githubusercontent.com/jquery/jquery-simulate/1.0.0/jquery.simulate.js' end - folder 'bootstrap' do - file 'bootstrap.tooltip.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v3.3.2/js/tooltip.js' - file 'bootstrap.dropdown.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v3.3.2/js/dropdown.js' - end - folder 'leaflet' do - 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' + file 'leaflet.js', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet-src.js' + file 'leaflet.css', 'https://unpkg.com/leaflet@1.6.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}", "http://cdn.leafletjs.com/leaflet/v0.7.7/images/#{image}" + file "images/#{image}", "https://unpkg.com/leaflet@1.6.0/dist/images/#{image}" + end + + from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.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 +26,7 @@ folder 'vendor/assets' do folder 'img', 'src/img' end - from 'git://github.com/domoritz/leaflet-locatecontrol.git' do + from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.71.0' do file 'leaflet.locate.js', 'src/L.Control.Locate.js' end @@ -34,7 +34,7 @@ folder 'vendor/assets' do file 'leaflet.osm.js', 'leaflet-osm.js' end - from 'git://github.com/jieter/Leaflet.encoded.git' do + from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.9' do file 'leaflet.polyline.js', 'Polyline.encoded.js' end end @@ -47,9 +47,11 @@ folder 'vendor/assets' do folder 'iD' do from 'git://github.com/openstreetmap/iD', :branch => 'release' do + folder 'iD/data', 'dist/data' folder 'iD/img', 'dist/img' folder 'iD/locales', 'dist/locales' - folder 'iD/traffico', 'dist/traffico' + folder 'iD/mapillary-js', 'dist/mapillary-js' + folder 'iD/pannellum-streetside', 'dist/pannellum-streetside' file 'iD.css.erb', 'dist/iD.css' do |path| rewrite(path) do |content| @@ -57,21 +59,23 @@ 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' - file 'presets.js', 'dist/presets.js' - file 'imagery.js', 'dist/imagery.js' + file 'iD.js', 'dist/iD.legacy.js' end end + folder 'polyfill' do + file 'es5.js', 'https://polyfill.io/v3/polyfill.js?features=es5&flags=gated,always' + file 'es6.js', 'https://polyfill.io/v3/polyfill.js?features=es6&flags=gated,always' + end + folder 'javascripts' do file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js' end + + folder 'swfobject' do + from 'git://github.com/swfobject/swfobject.git', :tag => '2.2' do + file 'expressInstall.swf', 'swfobject/expressInstall.swf' + file 'swfobject.js', 'swfobject/src/swfobject.js' + end + end end