From: Tom Hughes <tom@compton.nu>
Date: Tue, 20 Nov 2012 21:24:03 +0000 (+0000)
Subject: Make vendored asset definitions consistent
X-Git-Tag: live~5743^2~11
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/1ffb6d26873463d6e8b69cd7d355ab0e680bf8b0

Make vendored asset definitions consistent
---

diff --git a/Vendorfile b/Vendorfile
index 6d0eb1196..d7779f8f7 100644
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,21 +1,25 @@
 folder 'vendor/assets' do
   folder 'leaflet' do
     from 'https://github.com/CloudMade/Leaflet.git' do
-      file 'leaflet.css',    'dist/leaflet.css'
+      file 'leaflet.css', 'dist/leaflet.css'
       file 'leaflet.ie.css', 'dist/leaflet.ie.css'
-      file 'leaflet.js',     'dist/leaflet-src.js'
+      file 'leaflet.js', 'dist/leaflet-src.js'
       folder 'images', 'dist/images'
     end
 
-    from 'https://github.com/jfirebaugh/leaflet-locationfilter.git', :branch => 'osm' do
+    from 'https://github.com/tripbirds/leaflet-locationfilter.git' do
       file 'leaflet.locationfilter.css', 'src/locationfilter.css'
-      file 'leaflet.locationfilter.js',  'src/locationfilter.js'
+      file 'leaflet.locationfilter.js', 'src/locationfilter.js'
       folder 'img', 'src/img'
     end
 
-    file 'leaflet.pan.js',  'https://raw.github.com/kartena/Leaflet.Pancontrol/master/src/L.Control.Pan.js'
-    file 'leaflet.zoom.js', 'https://raw.github.com/kartena/Leaflet.zoomslider/master/src/L.Control.Zoomslider.js'
-    # CSS and sprite image are our own
+    from 'https://github.com/kartena/Leaflet.Pancontrol.git' do
+      file 'leaflet.pan.js', 'src/L.Control.Pan.js'
+    end
+
+    from 'https://github.com/kartena/Leaflet.zoomslider.git' do
+      file 'leaflet.zoom.js', 'src/L.Control.Zoomslider.js'
+    end
 
     from 'https://github.com/jfirebaugh/leaflet-osm.git' do
       file 'leaflet.osm.js', 'leaflet-osm.js'