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.
This commit is contained in:
Tom Hughes 2012-02-11 11:32:08 +00:00
parent c241c3c312
commit 97dba0fbbe

View file

@ -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();