Rework sidebar width calculation to work with jQuery 1.8

[rails.git] / app / views / site / _resize.html.erb

diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb
index a6583762fea4073778ec986312c373b3b4d74e5e..f26e2248c50a5d55602be4db3c223b4aa601bd73 100644 (file)
--- a/app/views/site/_resize.html.erb
+++ b/app/views/site/_resize.html.erb
@@ -18,12 +18,16 @@
   function resizeMap() {
     var content_width = $("#content").width();
     var content_height = $("#content").height();
   function resizeMap() {
     var content_width = $("#content").width();
     var content_height = $("#content").height();

-    var sidebar_width = 0 + $("#sidebar:visible").outerWidth(true);
+    var sidebar_width = 0;

     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"));
 
     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"));
 

+    $("#sidebar:visible").each(function () {
+      sidebar_width = sidebar_width + $(this).outerWidth(true);
+    });
+

     <% if t('html.dir') == "ltr" -%>
     $("#map").css("left", (sidebar_width) + "px");
     <% else -%>
     <% if t('html.dir') == "ltr" -%>
     $("#map").css("left", (sidebar_width) + "px");
     <% else -%>