X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/080d347d8fb55534bcd0ac8dafd61479d0401dc8..2a35f530bd5a474e83c8068ddc843eb0b4936b42:/app/views/site/_resize.html.erb

diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb
index 9ee05a7c8..a6583762f 100644
--- a/app/views/site/_resize.html.erb
+++ b/app/views/site/_resize.html.erb
@@ -16,21 +16,25 @@
   }
 
   function resizeMap() {
-    var sidebar_width = 0 + $("#sidebar:visible").width();
-
-    if (sidebar_width > 0 && window.width > 641) {
-      sidebar_width = sidebar_width + 5
-    }
+    var content_width = $("#content").width();
+    var content_height = $("#content").height();
+    var sidebar_width = 0 + $("#sidebar:visible").outerWidth(true);
+    var left_border = parseFloat($("#map").css("border-left-width"));
+    var right_border = parseFloat($("#map").css("border-right-width"));
+    var top_border = parseFloat($("#map").css("border-top-width"));
+    var bottom_border = parseFloat($("#map").css("border-bottom-width"));
 
     <% if t('html.dir') == "ltr" -%>
     $("#map").css("left", (sidebar_width) + "px");
     <% else -%>
     $("#map").css("right", (sidebar_width) + "px");
     <% end -%>
-    $("#map").width($("#content").width() - sidebar_width);
-    if (window.width > 641) {
-      $("#map").height($("#content").height() - 2);
-    }
+    $("#map").width(content_width - sidebar_width - left_border - right_border);
+    $("#map").height(content_height - top_border - bottom_border);
+
+    <% if params[:controller] == "site" and params[:action] == "index" -%>
+    map.updateSize();
+    <% end -%>
   }
 
   function handleResize() {