Merge pull request #4120 from AntonKhorev/no-deprecated-iframe-attrs

[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 5a19cb4d63a2679be1c6d20e8f2ec9e42cbb8ac3..625d43a5228f0b07a391f988a43cae3327364e67 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -9,8 +9,8 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
       map.removeLayer(marker);
     }
 

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

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


@@ -21,21 +21,21 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];

-    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+    var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";

 
     map = L.map("map", {
       attributionControl: false,
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
 
     map = L.map("map", {
       attributionControl: false,
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 

-    L.OSM.zoom({position: position})
+    L.OSM.zoom({ position: position })

       .addTo(map);
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
       .addTo(map);
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {

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

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