Fix layer map bounciness (#361)

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 0ec9b388c844eef59d461f4e234a2dc5ba46896d..029c0bfd1f1046fe8ef0617b911a48bd6bb4a1d1 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -51,30 +51,34 @@ $(document).ready(function () {
   map.noteLayer = new L.LayerGroup({code: 'N'});
   map.dataLayer = new L.OSM.DataLayer(null);
 
-  $("#map").on("resized", function () {
+  $("#sidebar").on("opened closed", function () {
     map.invalidateSize();
   });
 
-  L.OSM.zoom({position: 'topright'})
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})
     .addTo(map);
 
-  L.control.locate({position: 'topright'})
+  L.control.locate({position: position})
     .addTo(map);
 
-  var sidebar = L.OSM.sidebar('#map-ui');
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);
 
   L.OSM.layers({
-    position: 'topright',
+    position: position,
     layers: layers,
     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.key({
-    position: 'topright',
+    position: position,
     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.share({
+    position: position,
     getShortUrl: getShortUrl,
     getUrl: getUrl,
     sidebar: sidebar,
@@ -82,7 +86,7 @@ $(document).ready(function () {
   }).addTo(map);
 
   L.OSM.note({
-    position: 'topright',
+    position: position,
     sidebar: sidebar
   }).addTo(map);
 
@@ -135,8 +139,6 @@ $(document).ready(function () {
     addObjectToMap(params.object, map, { zoom: params.object_zoom });
   }
 
-  handleResize();
-
   $("body").on("click", "a.set_position", setPositionLink(map));
 
   $("a[data-editor=remote]").click(function(e) {
@@ -148,8 +150,6 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
-  $(window).resize(handleResize);
-
   $("#search_form").submit(submitSearch(map));