Merge remote-tracking branch 'upstream/pull/4996'

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 3a739e83addab2f346966fba9ad2134285fba13b..495470f2fd10ea35281b5f0377d9d19130bc8099 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -69,8 +69,8 @@ $(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 {
@@ -121,22 +121,26 @@ $(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(),
+    var lat = $("#home_lat").val().trim(),
+        lon = $("#home_lon").val().trim(),
         location;
 
     try {
       if (lat && lon) {
         location = L.latLng(lat, lon);
       }
-    } catch (error) {}
+      $("#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);