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

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index b9518f10de451cca7f76cccd20c257dad91f663c..8e4410fcee0568d04e2297a178205c60df144454 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) {
@@ -19,7 +19,7 @@ $(document).ready(function () {
       strings: {
         title: I18n.t("javascripts.map.locate.title"),
         popup: function (options) {
-          return I18n.t("javascripts.map.locate." + options.unit + "Popup", :count => options.distance);
+          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() {