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

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 69cc259f0c9e0195ecf5157ebb8d20d3e7703cac..3839a18c24c10a5d16c776b934a16b5bd673d6e0 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -18,6 +18,8 @@ $(document).ready(function () {
       iconLoading: "icon geolocate",
       strings: {
         title: I18n.t("javascripts.map.locate.title"),
       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")
       }
     }).addTo(map);
         popup: I18n.t("javascripts.map.locate.popup")
       }
     }).addTo(map);


@@ -85,8 +87,8 @@ $(document).ready(function () {
 
   $("select#user_auth_provider").on("change", updateAuthUID);
 
 
   $("select#user_auth_provider").on("change", updateAuthUID);
 

-  $("input#user_image").on("change", function () {
-    $("#image_action_new").prop("checked", true);
+  $("input#user_avatar").on("change", function () {
+    $("#avatar_action_new").prop("checked", true);

   });
 
   function enableAuth() {
   });
 
   function enableAuth() {