X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7a98913d0cf74887180aca3520c628a52b0e7071..57e711d3434664568998946d90ffef0a5f948130:/Vendorfile?ds=sidebyside diff --git a/Vendorfile b/Vendorfile index e67cd169d..babb601e8 100644 --- a/Vendorfile +++ b/Vendorfile @@ -1,11 +1,14 @@ folder 'vendor/assets' do folder 'leaflet' do - from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.5' do - file 'leaflet.css', 'dist/leaflet.css' - file 'leaflet.ie.css', 'dist/leaflet.ie.css' - file 'leaflet.js', 'dist/leaflet-src.js' - folder 'images', 'dist/images' - end + 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' + + [ '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 from 'git://github.com/kajic/leaflet-locationfilter.git' do file 'leaflet.locationfilter.css', 'src/locationfilter.css' @@ -13,23 +16,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' 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/mlevans/leaflet-hash.git' do + file 'leaflet.hash.js', 'leaflet-hash.js' + end end folder 'ohauth' do @@ -39,8 +36,9 @@ folder 'vendor/assets' do end folder 'iD' do - from 'git://github.com/systemed/iD', :branch => 'embed' do + from 'git://github.com/systemed/iD', :branch => 'release' do folder 'iD/img', 'dist/img' + folder 'iD/locales', 'dist/locales' file 'iD.css.erb', 'dist/iD.css' do |path| rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') } end