Eliminate interpolation in key JS

[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 d018cedc913206b87ffa04799a6231ee267eec02..3e371a417efdc0c2e5e24263947bfaa63bf4b696 100644 (file)
--- a/app/views/site/_resize.html.erb
+++ b/app/views/site/_resize.html.erb
@@ -16,19 +16,25 @@
   }
 
   function resizeMap() {
-    var sidebar_width = 0 + $("#sidebar:visible").outerWidth(true);
+    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 -%>
-    $("#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();
@@ -42,4 +48,9 @@
 
     resizeMap();
   }
+
+  $(document).ready(function () {
+    $("#sidebar").on("opened", resizeMap);
+    $("#sidebar").on("closed", resizeMap);
+  });
 </script>