Merge remote-tracking branch 'upstream/pull/2944' into master

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 30ccee4415add9f9f51dab32f119aa70f8f9ebb5..d00557322f5dd3126529c70b010a872910b09f66 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,23 +1,12 @@
 folder 'vendor/assets' do
   folder 'jquery' do
 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.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
   end
 
   folder 'leaflet' do

-    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet/v0.7.7/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/v0.7.7/images/#{image}"
+    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
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do
     end
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do


@@ -26,30 +15,22 @@ folder 'vendor/assets' do
       folder 'img', 'src/img'
     end
 
       folder 'img', 'src/img'
     end
 

-    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
 
     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' 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
 

-  folder 'ohauth' do
-    from 'git://github.com/osmlab/ohauth.git' do
-      file 'ohauth.js'
-    end
-  end
-

   folder 'iD' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do
   folder 'iD' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do

+      folder 'iD/data', 'dist/data'

       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'

-      folder 'iD/traffico', 'dist/traffico'
+      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|


@@ -57,21 +38,19 @@ 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'
-      file 'presets.js', 'dist/presets.js'
-      file 'imagery.js', 'dist/imagery.js'
+      file 'iD.js', 'dist/iD.legacy.js'

     end
   end
 
     end
   end
 

-  folder 'javascripts' do
-    file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js'
+  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 '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