X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1e45b8f521cec72cbf897272a5283fd42e60f35d..9e929de53091ab5db24be602546e525a72548dbd:/Vendorfile?ds=sidebyside diff --git a/Vendorfile b/Vendorfile index 0cca4055c..d66dd80d8 100644 --- a/Vendorfile +++ b/Vendorfile @@ -1,23 +1,28 @@ folder 'vendor/assets' do folder 'jquery' do - file 'jquery.cookie.js', 'https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js' - file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js' - file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js' + 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.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js' - file 'bootstrap.dropdown.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js' + 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.7.2/leaflet-src.js' - file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.2/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}", "http://cdn.leafletjs.com/leaflet-0.7.2/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,13 +31,17 @@ 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.62.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 + + 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 @@ -45,14 +54,19 @@ 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/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.js', 'dist/iD.js' end end folder 'javascripts' do - file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js' + file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js' end end