Move some javascript functions out of global scope

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 80b5059157ac40b40e4e155cbd1ccf7fc43b3b1e..22c2ad829ed345d5016e433b306d8f2e80f4beaf 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -6,10 +6,13 @@ $(document).ready(function () {
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.OSM.zoom()
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  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')
@@ -23,7 +26,7 @@ $(document).ready(function () {
   }
 
   if ($("#map").hasClass("set_location")) {
-    var marker = L.marker([0, 0], {icon: getUserIcon()});
+    var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
 
     if (OSM.home) {
       marker.setLatLng([OSM.home.lat, OSM.home.lon]);
@@ -33,7 +36,7 @@ $(document).ready(function () {
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
         var zoom = map.getZoom(),
-            precision = zoomPrecision(zoom),
+            precision = OSM.zoomPrecision(zoom),
             location = e.latlng.wrap();
 
         $('#homerow').removeClass();
@@ -48,7 +51,7 @@ $(document).ready(function () {
     $("[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)
+        L.marker([user.lat, user.lon], {icon: OSM.getUserIcon(user.icon)}).addTo(map)
           .bindPopup(user.description);
       }
     });