Fix line height for buttons in Firefox 30

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 3f86bb1844b248c6dcd6cf512895068ab6d3baad..c2267a6d8a41aac7133c256a3b85f4b20e45fcc5 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,10 +1,23 @@
 folder 'vendor/assets' do
 folder 'vendor/assets' do

+  folder 'jquery' do
+    file 'jquery.cookie.js', 'https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js'
+    file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
+    file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.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'
+  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'
+    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet-src.js'
+    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.3/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.3/images/#{image}"

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


@@ -13,12 +26,8 @@ folder 'vendor/assets' do
       folder 'img', 'src/img'
     end
 
       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'
+    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
     end
 
     from 'git://github.com/jfirebaugh/leaflet-osm.git' do


@@ -26,12 +35,6 @@ folder 'vendor/assets' do
     end
   end
 
     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'
   folder 'ohauth' do
     from 'git://github.com/osmlab/ohauth.git' do
       file 'ohauth.js'


@@ -39,7 +42,7 @@ folder 'vendor/assets' do
   end
 
   folder 'iD' do
   end
 
   folder 'iD' do

-    from 'git://github.com/systemed/iD', :branch => '1-0-stable' do
+    from 'git://github.com/openstreetmap/iD', :branch => 'release' do

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


@@ -48,4 +51,8 @@ folder 'vendor/assets' do
       file 'iD.js', 'dist/iD.js'
     end
   end
       file 'iD.js', 'dist/iD.js'
     end
   end

+
+  folder 'javascripts' do
+    file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js'
+  end

 end
 end