Update to latest osm-community-index

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 73bb2406ec2f0f680a8a685c674b6e4877b3a87e..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) {
 
 $(document).ready(function () {
   if ($("#map").length) {


@@ -9,7 +9,7 @@ $(document).ready(function () {
 
     var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
 
     var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 

-    L.OSM.zoom({position: position})
+    L.OSM.zoom({ position: position })

       .addTo(map);
 
     var locate = L.control.locate({
       .addTo(map);
 
     var locate = L.control.locate({


@@ -18,7 +18,9 @@ $(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"),

-        popup: I18n.t("javascripts.map.locate.popup")
+        popup: function (options) {
+          return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+        }

       }
     }).addTo(map);
 
       }
     }).addTo(map);
 


@@ -39,7 +41,7 @@ $(document).ready(function () {
     }
 
     if ($("#map").hasClass("set_location")) {
     }
 
     if ($("#map").hasClass("set_location")) {

-      var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
+      var marker = L.marker([0, 0], { icon: OSM.getUserIcon() });

 
       if (OSM.home) {
         marker.setLatLng([OSM.home.lat, OSM.home.lon]);
 
       if (OSM.home) {
         marker.setLatLng([OSM.home.lat, OSM.home.lon]);


@@ -64,7 +66,7 @@ $(document).ready(function () {
       $("[data-user]").each(function () {
         var user = $(this).data("user");
         if (user.lon && user.lat) {
       $("[data-user]").each(function () {
         var user = $(this).data("user");
         if (user.lon && user.lat) {

-          L.marker([user.lat, user.lon], {icon: OSM.getUserIcon(user.icon)}).addTo(map)
+          L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)

             .bindPopup(user.description);
         }
       });
             .bindPopup(user.description);
         }
       });


@@ -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 () {
+    $("#user_avatar_action_new").prop("checked", true);

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


@@ -124,4 +126,12 @@ $(document).ready(function () {
     $("#contributorTerms").html("<img src='" + OSM.SEARCHING + "' />");
     $("#contributorTerms").load(url);
   });
     $("#contributorTerms").html("<img src='" + OSM.SEARCHING + "' />");
     $("#contributorTerms").load(url);
   });

+
+  $("#read_ct").on("click", function () {
+    $("#continue").prop("disabled", !($(this).prop("checked") && $("#read_tou").prop("checked")));
+  });
+
+  $("#read_tou").on("click", function () {
+    $("#continue").prop("disabled", !($(this).prop("checked") && $("#read_ct").prop("checked")));
+  });

 });
 });