From 97dba0fbbe63fcccd3d36c5b577a12dce7c47ca7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 11 Feb 2012 11:32:08 +0000 Subject: [PATCH] Read the content area size before making any changes Adjusting the position of the map can impact the apparent size of the content area, so make sure we read that before we start making any changes to the position and size of the map. --- app/views/site/_resize.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb index d018cedc9..a6583762f 100644 --- a/app/views/site/_resize.html.erb +++ b/app/views/site/_resize.html.erb @@ -16,6 +16,8 @@ } function resizeMap() { + 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")); @@ -27,8 +29,8 @@ <% else -%> $("#map").css("right", (sidebar_width) + "px"); <% end -%> - $("#map").width($("#content").width() - sidebar_width - left_border - right_border); - $("#map").height($("#content").height() - top_border - bottom_border); + $("#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(); -- 2.43.2