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

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 3f86bb1844b248c6dcd6cf512895068ab6d3baad..0fe6e09b458618df123b5aad350833aa20aa80a6 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,50 +1,43 @@
 folder 'vendor/assets' do
 folder 'vendor/assets' do

+  folder 'jquery' 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
   folder 'leaflet' do

-    from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.6' do
-      file 'leaflet.css', 'dist/leaflet.css'
-      file 'leaflet.ie.css', 'dist/leaflet.ie.css'
-      file 'leaflet.js', 'dist/leaflet-src.js'
-      folder 'images', 'dist/images'
+    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
 
     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/kartena/Leaflet.Pancontrol.git' do
-      file 'leaflet.pan.js', 'src/L.Control.Pan.js'
-    end
-
-    from 'git://github.com/kartena/Leaflet.zoomslider.git' do
-      file 'leaflet.zoom.js', 'src/L.Control.Zoomslider.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

-  end
-
-  folder 'jquery' do
-    from 'git://github.com/jevin/Autogrow-Textarea.git' do
-      file 'jquery.autogrowtextarea.js', 'jquery.autogrowtextarea.js'
-    end  
-  end

 
 

-  folder 'ohauth' do
-    from 'git://github.com/osmlab/ohauth.git' do
-      file 'ohauth.js'
+    from 'https://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.9' do
+      file 'leaflet.polyline.js', 'Polyline.encoded.js'

     end
   end
 
   folder 'iD' do
     end
   end
 
   folder 'iD' do

-    from 'git://github.com/systemed/iD', :branch => '1-0-stable' 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/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'

+      folder 'iD/mapillary-js', 'dist/mapillary-js'
+      folder 'iD/pannellum', 'dist/pannellum'
+

       file 'iD.css.erb', 'dist/iD.css' do |path|
       file 'iD.css.erb', 'dist/iD.css' do |path|

-        rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') }
+        rewrite(path) do |content|
+          content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)')
+        end

       end
       end

+

       file 'iD.js', 'dist/iD.js'
     end
   end
       file 'iD.js', 'dist/iD.js'
     end
   end