Merge pull request #5558 from tomhughes/var-let-const

[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 b513057c148d8908fc167b05b271034c7c8a7c54..e55d0900d0b13a9e7d6081a6998043fa74784aeb 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -1,16 +1,18 @@
 $(document).ready(function () {
 $(document).ready(function () {

-  var marker, map;
+  let marker, map;

 
   function setLocation(e) {
 
   function setLocation(e) {

-    $("#latitude").val(e.latlng.lat);
-    $("#longitude").val(e.latlng.lng);
+    const latlng = e.latlng.wrap();
+
+    $("#latitude").val(latlng.lat);
+    $("#longitude").val(latlng.lng);

 
     if (marker) {
       map.removeLayer(marker);
     }
 
 
     if (marker) {
       map.removeLayer(marker);
     }
 

-    marker = L.marker(e.latlng, {icon: OSM.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) {


@@ -19,23 +21,23 @@ $(document).ready(function () {
     $("#map").show();
     $("#usemap").hide();
 
     $("#map").show();
     $("#usemap").hide();
 

-    var params = $("#map").data();
-    var centre = [params.lat, params.lon];
-    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+    const params = $("#map").data();
+    const centre = [params.lat, params.lon];
+    const 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: OSM.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);