Add terminating semicolon to overpass query

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 80b5059157ac40b40e4e155cbd1ccf7fc43b3b1e..bdf0443056329df566e07fbc880dd8ea3153b79c 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,56 +1,127 @@
 //= require leaflet.locate
 
 $(document).ready(function () {
-  var map = L.map("map", {
-    attributionControl: false,
-    zoomControl: false
-  }).addLayer(new L.OSM.Mapnik());
-
-  L.OSM.zoom()
-    .addTo(map);
-
-  L.control.locate({
-    strings: {
-      title: I18n.t('javascripts.map.locate.title'),
-      popup: I18n.t('javascripts.map.locate.popup')
-    }
-  }).addTo(map);
+  if ($("#map").length) {
+    var map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());
 
-  if (OSM.home) {
-    map.setView([OSM.home.lat, OSM.home.lon], 12);
-  } else {
-    map.setView([0, 0], 0);
-  }
+    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+    L.OSM.zoom({position: position})
+      .addTo(map);
 
-  if ($("#map").hasClass("set_location")) {
-    var marker = L.marker([0, 0], {icon: getUserIcon()});
+    var locate = L.control.locate({
+      position: position,
+      icon: 'icon geolocate',
+      iconLoading: 'icon geolocate',
+      strings: {
+        title: I18n.t('javascripts.map.locate.title'),
+        popup: I18n.t('javascripts.map.locate.popup')
+      }
+    }).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) {
-      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
-      marker.addTo(map);
+      map.setView([OSM.home.lat, OSM.home.lon], 12);
+    } else {
+      map.setView([0, 0], 0);
     }
 
-    map.on("click", function (e) {
-      if ($('#updatehome').is(':checked')) {
-        var zoom = map.getZoom(),
-            precision = zoomPrecision(zoom),
-            location = e.latlng.wrap();
-
-        $('#homerow').removeClass();
-        $('#home_lat').val(location.lat.toFixed(precision));
-        $('#home_lon').val(location.lng.toFixed(precision));
+    if ($("#map").hasClass("set_location")) {
+      var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
 
-        marker.setLatLng(e.latlng);
+      if (OSM.home) {
+        marker.setLatLng([OSM.home.lat, OSM.home.lon]);
         marker.addTo(map);
       }
-    });
+
+      map.on("click", function (e) {
+        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));
+
+          marker.setLatLng(e.latlng);
+          marker.addTo(map);
+        }
+      });
+    } else {
+      $("[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)
+            .bindPopup(user.description);
+        }
+      });
+    }
+  }
+
+  function updateAuthUID() {
+    var provider = $("select#user_auth_provider").val();
+
+    if (provider === "openid") {
+      $("input#user_auth_uid").show().prop("disabled", false);
+    } else {
+      $("input#user_auth_uid").hide().prop("disabled", true);
+    }
+  }
+
+  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();
+    $("#user_auth_uid").prop("disabled", false);
+  }
+
+  function disableAuth() {
+    $("#auth_prompt").show();
+    $("#auth_field").hide();
+    $("#user_auth_uid").prop("disabled", true);
+  }
+
+  $("#auth_enable").click(enableAuth);
+
+  if ($("select#user_auth_provider").val() === "") {
+    disableAuth();
   } else {
-    $("[data-user]").each(function () {
-      var user = $(this).data('user');
-      if (user.lon && user.lat) {
-        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
-          .bindPopup(user.description);
-      }
-    });
+    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);
+  });
 });