Fixed tests + Altered migration file + Added reporting strings + Added update method

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 97827fb8d3474b230c2fa7c6828cc4c4211ef913..e8ad3324d0ccc2b01e5a4e3b388b39f0d47f6603 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,45 +1,95 @@
-function init(){
-  var params = $("#map").data();
-  var map = createMap("map");
+//= require leaflet.locate

 
 

-  setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+$(document).ready(function () {
+  if ($("#map").length) {
+    var map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());

 
 

-  if ($("#map").hasClass("set_location")) {
-    var marker;
+    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';

 
 

-    if (params.marker) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat));
+    L.OSM.zoom({position: position})
+      .addTo(map);
+
+    L.control.locate({
+      position: position,
+      strings: {
+        title: I18n.t('javascripts.map.locate.title'),
+        popup: I18n.t('javascripts.map.locate.popup')
+      }
+    }).addTo(map);
+
+    if (OSM.home) {
+      map.setView([OSM.home.lat, OSM.home.lon], 12);
+    } else {
+      map.setView([0, 0], 0);

     }
 
     }
 

-    map.events.register("click", map, function (e) {
-      closeMapPopup();
+    if ($("#map").hasClass("set_location")) {
+      var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});

 
 

-      if (document.getElementById('updatehome').checked) {
-        var lonlat = getEventPosition(e);
+      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();

 
 

-        document.getElementById('homerow').className = '';
-        document.getElementById('home_lat').value = lonlat.lat;
-        document.getElementById('home_lon').value = lonlat.lon;
+          $('#homerow').removeClass();
+          $('#home_lat').val(location.lat.toFixed(precision));
+          $('#home_lon').val(location.lng.toFixed(precision));

 
 

-        if (marker) {
-          removeMarkerFromMap(marker);
+          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);

         }
         }

+      });
+    }
+  }

 
 

-        marker = addMarkerToMap(lonlat);
-      }
-    });
-  } else {
-    addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat), null, params.marker.description);
-
-    $("[data-user]").each(function () {
-      var user = $(this).data('user');
-      if (user.lon && user.lat) {
-        var icon = OpenLayers.Marker.defaultIcon();
-        icon.url = OpenLayers.Util.getImageLocation(user.icon);
-        addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, 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);
+
+  function enableAuth() {
+    $("#auth_prompt").hide();
+    $("#auth_field").show();
+    $("#user_auth_uid").prop("disabled", false);

   }
   }

-}

 
 

-window.onload = init;
+  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 {
+    enableAuth();
+  }
+});