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

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index c2841a5c4135cfb0ccb003587eec944a5571d10c..4c6a80839d9264fd60cfa760bdb4f12d0bf7b0ed 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,47 +1,36 @@
 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'
   end
 
   folder 'leaflet' do
     file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
   end
 
   folder 'leaflet' do

-    from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.1' do
+    from 'https://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
 

-    from 'git://github.com/kajic/leaflet-locationfilter.git' do
+    from 'https://github.com/kajic/leaflet-locationfilter.git' do

       file 'leaflet.locationfilter.css', 'src/locationfilter.css'
       file 'leaflet.locationfilter.js', 'src/locationfilter.js'
       folder 'img', 'src/img'
     end
 
       file 'leaflet.locationfilter.css', 'src/locationfilter.css'
       file 'leaflet.locationfilter.js', 'src/locationfilter.js'
       folder 'img', 'src/img'
     end
 

-    from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.71.0' do
-      file 'leaflet.locate.js', 'src/L.Control.Locate.js'
-    end
-
-    from 'git://github.com/jfirebaugh/leaflet-osm.git' do
+    from 'https://github.com/openstreetmap/leaflet-osm.git' 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.9' do
+    from 'https://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
   folder 'iD' do

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

       folder 'iD/data', 'dist/data'
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/mapillary-js', 'dist/mapillary-js'
       folder 'iD/data', 'dist/data'
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/mapillary-js', 'dist/mapillary-js'

-      folder 'iD/pannellum-streetside', 'dist/pannellum-streetside'
+      folder 'iD/pannellum', 'dist/pannellum'

 
       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|


@@ -49,19 +38,11 @@ folder 'vendor/assets' do
         end
       end
 
         end
       end
 

-      file 'iD.js', 'dist/iD.legacy.js'
+      file 'iD.js', 'dist/iD.js'

     end
   end
 
   folder 'polyfill' do
     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
     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