Resolve issues (without really fixing them, because I'm not sure where they came from) with leaflet-illustrate spritesheet-2x.png and sass gem.

This commit is contained in:
Justin Manley
2014-08-21 21:24:58 -05:00
parent aadd8b5794
commit f3ad5f76db
6 changed files with 5 additions and 30 deletions

3
.bundle/config Normal file
View File

@@ -0,0 +1,3 @@
---
BUNDLE_PATH: vendor/bundle
BUNDLE_DISABLE_SHARED_GEMS: "1"

1
.gitignore vendored
View File

@@ -19,6 +19,5 @@ config/initializers/recaptcha.rb
config/config.yml
config/initializers/site_keys.rb
.bundle
vendor/bundle
app/assets/bower_packages

View File

@@ -15,12 +15,9 @@
<%= javascript_include_tag 'maps' %>
</head>
<body>
<%= yield %>
<%= yield %>
<script>
initializeLeaflet(
{ lat: <%= @map.lat %>, lng: <%= @map.lon %> },
<%= @map.zoom %>
);
initializeLeaflet({ lat: <%= @map.lat %>, lng: <%= @map.lon %> }, <%= @map.zoom %>);
</script>
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

View File

@@ -1,18 +0,0 @@
<script type="text/javascript">
var center = L.latLng(<%= @map.lat %>, <%= @map.lon %>),
zoom = <%= @map.zoom %>,
map = L.map('knitter-map-pane', { zoomControl: false })
.setView(center, zoom),
drawnItems = new L.FeatureGroup().addTo(map),
zoomControl = L.control.zoom({ position: 'topright' }).addTo(map),
illustrateControl = new L.Illustrate.Control({
position: 'topright',
edit: { featureGroup: drawnItems }
}).addTo(map),
drawControl = new L.Control.Draw({
position: 'topright',
edit: { featureGroup: drawnItems }
}).addTo(map);
L.tileLayer.provider('Esri.WorldImagery').addTo(map);
</script>

View File

@@ -1,8 +1,2 @@
<div id="knitter-map-pane"></div>
<script>
initializeLeaflet(
{ lat: <%= @map.lat %>, lng: <%= @map.lon %> },
<%= @map.zoom %>
);
</script>
<%= render :partial => "sidebar", :locals => { :mode => "edit" } %>

Binary file not shown.