Merge remote-tracking branch 'upstream/pull/2637'

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 304be9e15de2ae9d92a8d237cb7281e36e3a0068..5deed27a6eb2e7d22bafac96819bc3f8b2a1053f 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -5,22 +5,17 @@ folder 'vendor/assets' do
     file 'jquery.simulate.js', 'https://raw.githubusercontent.com/jquery/jquery-simulate/1.0.0/jquery.simulate.js'
   end
 
     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
   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.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|
 
     [ '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.6.0/dist/images/#{image}"

     end
 
     end
 

-    from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.2.1' do
+    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
       file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js'
       file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css'
     end


@@ -31,7 +26,7 @@ folder 'vendor/assets' do
       folder 'img', 'src/img'
     end
 
       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.71.0' do

       file 'leaflet.locate.js', 'src/L.Control.Locate.js'
     end
 
       file 'leaflet.locate.js', 'src/L.Control.Locate.js'
     end
 


@@ -39,7 +34,7 @@ folder 'vendor/assets' do
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
 
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
 

-    from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.8' do
+    from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.9' do

       file 'leaflet.polyline.js', 'Polyline.encoded.js'
     end
   end
       file 'leaflet.polyline.js', 'Polyline.encoded.js'
     end
   end


@@ -54,8 +49,8 @@ folder 'vendor/assets' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
     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'
       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|
 
       file 'iD.css.erb', 'dist/iD.css' do |path|
         rewrite(path) do |content|


@@ -63,19 +58,23 @@ folder 'vendor/assets' do
         end
       end
 
         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
 
       file 'iD.js', 'dist/iD.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 '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
 end