Trigger map.updateSize() via a custom event

[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..4b312bf8c49927890a47d740a5f808df5800761b 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 -%>


@@ -31,10 +35,7 @@
     <% end -%>
     $("#map").width(content_width - sidebar_width - left_border - right_border);
     $("#map").height(content_height - top_border - bottom_border);
     <% end -%>
     $("#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 -%>
+    $("#map").trigger("resized");

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


@@ -44,4 +45,9 @@
 
     resizeMap();
   }
 
     resizeMap();
   }

+
+  $(document).ready(function () {
+    $("#sidebar").on("opened", resizeMap);
+    $("#sidebar").on("closed", resizeMap);
+  });

 </script>
 </script>