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

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index e8ad3324d0ccc2b01e5a4e3b388b39f0d47f6603..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) {


@@ -7,19 +7,33 @@ $(document).ready(function () {
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 

-    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);
 
       .addTo(map);
 

-    L.control.locate({
+    var locate = L.control.locate({

       position: position,
       position: position,

+      icon: "icon geolocate",
+      iconLoading: "icon geolocate",

       strings: {
       strings: {

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

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

+    var locateContainer = locate.getContainer();
+
+    $(locateContainer)
+      .removeClass("leaflet-control-locate leaflet-bar")
+      .addClass("control-locate")
+      .children("a")
+      .attr("href", "#")
+      .removeClass("leaflet-bar-part leaflet-bar-part-single")
+      .addClass("control-button");
+

     if (OSM.home) {
       map.setView([OSM.home.lat, OSM.home.lon], 12);
     } else {
     if (OSM.home) {
       map.setView([OSM.home.lat, OSM.home.lon], 12);
     } else {


@@ -27,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]);


@@ -35,14 +49,14 @@ $(document).ready(function () {
       }
 
       map.on("click", function (e) {
       }
 
       map.on("click", function (e) {

-        if ($('#updatehome').is(':checked')) {
+        if ($("#updatehome").is(":checked")) {

           var zoom = map.getZoom(),
               precision = OSM.zoomPrecision(zoom),
               location = e.latlng.wrap();
 
           var zoom = map.getZoom(),
               precision = OSM.zoomPrecision(zoom),
               location = e.latlng.wrap();
 

-          $('#homerow').removeClass();
-          $('#home_lat').val(location.lat.toFixed(precision));
-          $('#home_lon').val(location.lng.toFixed(precision));
+          $("#homerow").removeClass();
+          $("#home_lat").val(location.lat.toFixed(precision));
+          $("#home_lon").val(location.lng.toFixed(precision));

 
           marker.setLatLng(e.latlng);
           marker.addTo(map);
 
           marker.setLatLng(e.latlng);
           marker.addTo(map);


@@ -50,9 +64,9 @@ $(document).ready(function () {
       });
     } else {
       $("[data-user]").each(function () {
       });
     } else {
       $("[data-user]").each(function () {

-        var user = $(this).data('user');
+        var user = $(this).data("user");

         if (user.lon && user.lat) {
         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);
         }
       });


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

+  $("input#user_avatar").on("change", function () {
+    $("#user_avatar_action_new").prop("checked", true);
+  });
+

   function enableAuth() {
     $("#auth_prompt").hide();
     $("#auth_field").show();
   function enableAuth() {
     $("#auth_prompt").hide();
     $("#auth_field").show();


@@ -92,4 +110,28 @@ $(document).ready(function () {
   } else {
     enableAuth();
   }
   } else {
     enableAuth();
   }

+
+  $("#user_all").change(function () {
+    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
+  });
+
+  $("#content.user_confirm").each(function () {
+    $(this).hide();
+    $(this).find("#confirm").submit();
+  });
+
+  $("input[name=legale]").change(function () {
+    var url = $(this).data("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")));
+  });

 });
 });