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

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index d66dd80d8077afcbaf3f04aa394a6f767cbdf6ac..5303d738f69a511f7500e7015b101b7f10ed0a8e 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -11,16 +11,16 @@ folder 'vendor/assets' do
   end
 
   folder 'leaflet' do
   end
 
   folder 'leaflet' do

-    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'
+    file 'leaflet.js', 'https://unpkg.com/leaflet@1.3.3/dist/leaflet-src.js'
+    file 'leaflet.css', 'https://unpkg.com/leaflet@1.3.3/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.2.0/dist/images/#{image}"
+      file "images/#{image}", "https://unpkg.com/leaflet@1.3.3/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.0' 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


@@ -55,6 +55,7 @@ folder 'vendor/assets' do
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/mapillary-js', 'dist/mapillary-js'
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       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|


@@ -68,5 +69,13 @@ folder 'vendor/assets' do
 
   folder 'javascripts' do
     file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js'
 
   folder 'javascripts' do
     file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js'

+    file 'bowser.js', 'https://github.com/lancedikson/bowser/releases/download/1.9.3/bowser.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
 end