Merge remote-tracking branch 'openstreetmap/pull/1122'

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d96bbad4a426cc0eff41fb1ac914ee44519ca479..fdbeaba22fbc0bf50b96133405cc62c93d52d0c5 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -165,15 +165,6 @@ $(document).ready(function () {
     $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 
-  if ($.cookie('_osm_donatedone2015') === 'hide') {
-    $('#donate').hide();
-  }
-
-  $('#donate .close').on('click', function() {
-    $('#donate').hide();
-    $.cookie("_osm_donatedone2015", 'hide', { expires: expiry });
-  });
-
   if ($.cookie('_osm_welcome') === 'hide') {
     $('.welcome').hide();
   }
@@ -201,10 +192,8 @@ $(document).ready(function () {
     map.setView([params.lat, params.lon], params.zoom);
   }
 
-  var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
-
   if (params.marker) {
-    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+    L.marker([params.mlat, params.mlon]).addTo(map);
   }
 
   $("#homeanchor").on("click", function(e) {
@@ -214,7 +203,7 @@ $(document).ready(function () {
       center = L.latLng(data.lat, data.lon);
 
     map.setView(center, data.zoom);
-    marker.setLatLng(center).addTo(map);
+    L.marker(center, {icon: OSM.getUserIcon()}).addTo(map);
   });
 
   function remoteEditHandler(bbox, object) {