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

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 3839a18c24c10a5d16c776b934a16b5bd673d6e0..14da8f300497cc8fd0497616a0ef1d21923b95ae 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,4 +1,4 @@
-//= require leaflet.locate
+//= require leaflet.locatecontrol/src/L.Control.Locate
 
 $(document).ready(function () {
   if ($("#map").length) {
@@ -18,9 +18,9 @@ $(document).ready(function () {
       iconLoading: "icon geolocate",
       strings: {
         title: I18n.t("javascripts.map.locate.title"),
-        metersUnit: I18n.t("javascripts.map.locate.metersUnit"),
-        feetUnit: I18n.t("javascripts.map.locate.feetUnit"),
-        popup: I18n.t("javascripts.map.locate.popup")
+        popup: function (options) {
+          return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+        }
       }
     }).addTo(map);
 
@@ -88,7 +88,7 @@ $(document).ready(function () {
   $("select#user_auth_provider").on("change", updateAuthUID);
 
   $("input#user_avatar").on("change", function () {
-    $("#avatar_action_new").prop("checked", true);
+    $("#user_avatar_action_new").prop("checked", true);
   });
 
   function enableAuth() {
@@ -123,7 +123,7 @@ $(document).ready(function () {
   $("input[name=legale]").change(function () {
     var url = $(this).data("url");
 
-    $("#contributorTerms").html("<img src='" + OSM.SEARCHING + "' />");
+    $("#contributorTerms").html("<div class='spinner-border' role='status'><span class='visually-hidden'>" + I18n.t("browse.start_rjs.loading") + "</span></div>");
     $("#contributorTerms").load(url);
   });