X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/81ce6a7de0be8ada90ebc587506d957d609babfa..5ce51e974886e4671d97cc4fd7b231874ae4023e:/app/assets/javascripts/user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index c306273e5..b94db8b55 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,4 +1,10 @@
-//= require leaflet.locatecontrol/src/L.Control.Locate
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+
+(function () {
+  $(document).on("change", "#user_all", function () {
+    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
+  });
+}());
 
 $(document).ready(function () {
   var defaultHomeZoom = 12;
@@ -69,10 +75,19 @@ $(document).ready(function () {
         deleted_lon = null;
         respondToHomeUpdate();
       }).on("moveend", function () {
-        var lat = $("#home_lat").val(),
-            lon = $("#home_lon").val();
+        var lat = $("#home_lat").val().trim(),
+            lon = $("#home_lon").val().trim(),
+            location;
+
+        try {
+          if (lat && lon) {
+            location = L.latLng(lat, lon);
+          }
+        } catch (error) {
+          // keep location undefined
+        }
 
-        $("#home_show").prop("disabled", isCloseEnoughToMapCenter(lat, lon));
+        $("#home_show").prop("disabled", !location || isCloseEnoughToMapCenter(location));
       });
 
       $("#home_lat, #home_lon").on("input", function () {
@@ -112,22 +127,32 @@ $(document).ready(function () {
         var user = $(this).data("user");
         if (user.lon && user.lat) {
           L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)
-            .bindPopup(user.description);
+            .bindPopup(user.description, { minWidth: 200 });
         }
       });
     }
   }
 
   function respondToHomeUpdate() {
-    var lat = $("#home_lat").val(),
-        lon = $("#home_lon").val(),
-        has_home = !!(lat && lon);
-
-    $("#home_message").toggleClass("invisible", has_home);
-    $("#home_show").prop("hidden", !has_home);
-    $("#home_delete").prop("hidden", !has_home);
-    $("#home_undelete").prop("hidden", !(!has_home && deleted_lat && deleted_lon));
-    if (has_home) {
+    var lat = $("#home_lat").val().trim(),
+        lon = $("#home_lon").val().trim(),
+        location;
+
+    try {
+      if (lat && lon) {
+        location = L.latLng(lat, lon);
+      }
+      $("#home_lat, #home_lon").removeClass("is-invalid");
+    } catch (error) {
+      if (lat && isNaN(lat)) $("#home_lat").addClass("is-invalid");
+      if (lon && isNaN(lon)) $("#home_lon").addClass("is-invalid");
+    }
+
+    $("#home_message").toggleClass("invisible", Boolean(location));
+    $("#home_show").prop("hidden", !location);
+    $("#home_delete").prop("hidden", !location);
+    $("#home_undelete").prop("hidden", !(!location && deleted_lat && deleted_lon));
+    if (location) {
       marker.setLatLng([lat, lon]);
       marker.addTo(map);
       map.panTo([lat, lon]);
@@ -136,8 +161,8 @@ $(document).ready(function () {
     }
   }
 
-  function isCloseEnoughToMapCenter(lat, lon) {
-    var inputPt = map.latLngToContainerPoint([lat, lon]),
+  function isCloseEnoughToMapCenter(location) {
+    var inputPt = map.latLngToContainerPoint(location),
         centerPt = map.latLngToContainerPoint(map.getCenter());
 
     return centerPt.distanceTo(inputPt) < 10;
@@ -181,10 +206,6 @@ $(document).ready(function () {
     enableAuth();
   }
 
-  $("#user_all").change(function () {
-    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
-  });
-
   $("#content.user_confirm").each(function () {
     $(this).hide();
     $(this).find("#confirm").submit();