Use the distance_in_words_ago scope for trace display

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 1c73d3430456e6016cb48c528a0d89ab1d870366..69cc259f0c9e0195ecf5157ebb8d20d3e7703cac 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -7,30 +7,30 @@ $(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);
 
     var locate = L.control.locate({
       position: position,
       .addTo(map);
 
     var locate = L.control.locate({
       position: position,

-      icon: 'icon geolocate',
-      iconLoading: 'icon geolocate',
+      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: I18n.t("javascripts.map.locate.popup")

       }
     }).addTo(map);
 
     var locateContainer = locate.getContainer();
 
     $(locateContainer)
       }
     }).addTo(map);
 
     var locateContainer = locate.getContainer();
 
     $(locateContainer)

-      .removeClass('leaflet-control-locate leaflet-bar')
-      .addClass('control-locate')
+      .removeClass("leaflet-control-locate leaflet-bar")
+      .addClass("control-locate")

       .children("a")
       .children("a")

-      .attr('href', '#')
-      .removeClass('leaflet-bar-part leaflet-bar-part-single')
-      .addClass('control-button');
+      .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);
 
     if (OSM.home) {
       map.setView([OSM.home.lat, OSM.home.lon], 12);


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


@@ -47,14 +47,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);


@@ -62,9 +62,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);
         }
       });


@@ -85,6 +85,10 @@ $(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);
+  });
+

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


@@ -120,4 +124,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")));
+  });

 });
 });