Don't try and use OAuth if we don't have a token

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

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 30038a0afdbc51894930ca11b2600c4cbfd063bd..291c8652382a85ab4cee1414eb6ce5d962a8bfef 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -6,10 +6,11 @@ $(document).ready(function () {
     $("#longitude").val(e.latlng.lng);
 
     if (marker) {
     $("#longitude").val(e.latlng.lng);
 
     if (marker) {

-      removeMarkerFromMap(marker);
+      map.removeLayer(marker);

     }
 
     }
 

-    marker = addMarkerToMap(e.latlng, null, I18n.t('diary_entry.edit.marker_text'));
+    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
+      .bindPopup(I18n.t('diary_entry.edit.marker_text'));

   }
 
   $("#usemap").click(function (e) {
   }
 
   $("#usemap").click(function (e) {


@@ -25,7 +26,8 @@ $(document).ready(function () {
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {

-      marker = addMarkerToMap(centre, null, I18n.t('diary_entry.edit.marker_text'));
+      marker = L.marker(centre, {icon: getUserIcon()}).addTo(map)
+        .bindPopup(I18n.t('diary_entry.edit.marker_text'));

     }
 
     map.on("click", setLocation);
     }
 
     map.on("click", setLocation);