X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e4ed5ae2756fb00d039f0da5b9dafd52862adf12..0814b4096c443e2ab3c09baa058aa81a00d205d1:/Vendorfile?ds=inline diff --git a/Vendorfile b/Vendorfile index 3eee989d3..361f2c843 100644 --- a/Vendorfile +++ b/Vendorfile @@ -1,14 +1,24 @@ folder 'vendor/assets' do + folder 'jquery' do + file 'jquery.cookie.js', 'https://raw.githubusercontent.com/carhartl/jquery-cookie/master/src/jquery.cookie.js' + file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js' + 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-0.6.3/leaflet-src.js' - file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.6.3/leaflet.css' - file 'leaflet.ie.css', 'http://cdn.leafletjs.com/leaflet-0.6.3/leaflet.ie.css' + 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' [ '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.6.3/images/#{image}" - end + file "images/#{image}", "https://unpkg.com/leaflet@1.0.3/dist/images/#{image}" + end from 'git://github.com/kajic/leaflet-locationfilter.git' do file 'leaflet.locationfilter.css', 'src/locationfilter.css' @@ -16,23 +26,17 @@ folder 'vendor/assets' do folder 'img', 'src/img' end - from 'git://github.com/kartena/Leaflet.Pancontrol.git' do - file 'leaflet.pan.js', 'src/L.Control.Pan.js' - end - - from 'git://github.com/kartena/Leaflet.zoomslider.git' do - file 'leaflet.zoom.js', 'src/L.Control.Zoomslider.js' + from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.54.0' do + file 'leaflet.locate.js', 'src/L.Control.Locate.js' end from 'git://github.com/jfirebaugh/leaflet-osm.git' do file 'leaflet.osm.js', 'leaflet-osm.js' end - end - folder 'jquery' do - from 'git://github.com/jevin/Autogrow-Textarea.git' do - file 'jquery.autogrowtextarea.js', 'jquery.autogrowtextarea.js' - end + from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.8' do + file 'leaflet.polyline.js', 'Polyline.encoded.js' + end end folder 'ohauth' do @@ -42,13 +46,31 @@ folder 'vendor/assets' do end folder 'iD' do - from 'git://github.com/systemed/iD', :branch => '1-0-stable' 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| - 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' end end + + folder 'javascripts' do + file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js' + end end