From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 5 Nov 2013 23:57:03 +0000 (-0800)
Subject: Fix map controls on user settings page
X-Git-Tag: live~4653^2~194
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/66811558659c5b0e4b276e0be185e64a522846ff?hp=dcf56d9376680f924b080ad46ac547e3b7fb7324;ds=sidebyside

Fix map controls on user settings page
---

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 1aa728ea0..5a19cb4d6 100644
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -21,13 +21,14 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
+    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
     map = L.map("map", {
       attributionControl: false,
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
-    L.OSM.zoom()
+    L.OSM.zoom({position: position})
       .addTo(map);
 
     map.setView(centre, params.zoom);
diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 80b505915..6a0d38dd5 100644
--- 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')