Move a chunk of non-markup ruby code from a view to the controller

[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 30ee81f05ccba84b2098988523af9c32a37c0613..f26e2248c50a5d55602be4db3c223b4aa601bd73 100644 (file)
--- a/app/views/site/_resize.html.erb
+++ b/app/views/site/_resize.html.erb
@@ -16,19 +16,29 @@
   }
 
   function resizeMap() {
   }
 
   function resizeMap() {

-    var sidebar_width = 0 + $("#sidebar:visible").outerWidth(true);
-    var left_border = 0 + $("#map").css("border-left-width");
-    var right_border = 0 + $("#map").css("border-right-width");
-    var top_border = 0 + $("#map").css("border-top-width");
-    var bottom_border = 0 + $("#map").css("border-bottom-width");
+    var content_width = $("#content").width();
+    var content_height = $("#content").height();
+    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"));
+
+    $("#sidebar:visible").each(function () {
+      sidebar_width = sidebar_width + $(this).outerWidth(true);
+    });

 
     <% if t('html.dir') == "ltr" -%>
     $("#map").css("left", (sidebar_width) + "px");
     <% else -%>
     $("#map").css("right", (sidebar_width) + "px");
     <% end -%>
 
     <% 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 - 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();
+    <% end -%>

   }
 
   function handleResize() {
   }
 
   function handleResize() {