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

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index f6c4151857fef2c9bb6dad0bff9ecf14f18ed422..146d876f789643d20abfed4043cbf44989c8af59 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -69,10 +69,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 () {
@@ -96,6 +105,7 @@ $(document).ready(function () {
         deleted_lat = lat;
         deleted_lon = lon;
         respondToHomeUpdate();
+        $("#home_undelete").trigger("focus");
       });
 
       $("#home_undelete").click(function () {
@@ -104,6 +114,7 @@ $(document).ready(function () {
         deleted_lat = null;
         deleted_lon = null;
         respondToHomeUpdate();
+        $("#home_delete").trigger("focus");
       });
     } else {
       $("[data-user]").each(function () {
@@ -117,15 +128,25 @@ $(document).ready(function () {
   }
 
   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]);
@@ -134,8 +155,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;