Merge branch 'master' into iD-2.19.6

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index c2841a5c4135cfb0ccb003587eec944a5571d10c..6b586f9ce2d03666f9287baa0612a43d47c11888 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,6 +1,5 @@
 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
 
     file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
   end
 


@@ -16,10 +15,6 @@ folder 'vendor/assets' do
       folder 'img', 'src/img'
     end
 
       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
       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


@@ -29,12 +24,6 @@ folder 'vendor/assets' do
     end
   end
 
     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/data', 'dist/data'
   folder 'iD' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do
       folder 'iD/data', 'dist/data'


@@ -57,11 +46,4 @@ folder 'vendor/assets' 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 '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