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

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 4fc1e53485cb1407c857682707ac6f2f4b217c0b..0fe6e09b458618df123b5aad350833aa20aa80a6 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,55 +1,43 @@
 folder 'vendor/assets' do
   folder 'jquery' do
-    file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
-  end
-
-  folder 'bootstrap' do
-    file 'bootstrap.tooltip.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js'
-    file 'bootstrap.dropdown.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.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 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.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-0.7/images/#{image}"
+    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
 
-    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
 
-    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
+    from 'https://github.com/openstreetmap/leaflet-osm.git' do
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
 
-    from 'git://github.com/mlevans/leaflet-hash.git' do
-      file 'leaflet.hash.js', 'leaflet-hash.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
-    from 'git://github.com/systemed/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/pannellum', 'dist/pannellum'
+
       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
+
       file 'iD.js', 'dist/iD.js'
     end
   end