X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/56e96d856c7fc168b37cf9d26a58a6da8094cedb..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/assets/javascripts/user.js diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index 44872a78c..377efb315 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -7,29 +7,32 @@ $(document).ready(function () { 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, - icon: 'icon geolocate', - iconLoading: 'icon geolocate', + icon: "icon geolocate", + iconLoading: "icon geolocate", 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); 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") - .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); @@ -38,7 +41,7 @@ $(document).ready(function () { } 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]); @@ -46,14 +49,14 @@ $(document).ready(function () { } 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(); - $('#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); @@ -61,9 +64,9 @@ $(document).ready(function () { }); } else { $("[data-user]").each(function () { - var user = $(this).data('user'); + 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); } }); @@ -84,6 +87,10 @@ $(document).ready(function () { $("select#user_auth_provider").on("change", updateAuthUID); + $("input#user_avatar").on("change", function () { + $("#avatar_action_new").prop("checked", true); + }); + function enableAuth() { $("#auth_prompt").hide(); $("#auth_field").show(); @@ -119,4 +126,12 @@ $(document).ready(function () { $("#contributorTerms").html(""); $("#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"))); + }); });