Use custom events to resize the map on sidebar open/close

diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb
index f26e2248c50a5d55602be4db3c223b4aa601bd73..3e371a417efdc0c2e5e24263947bfaa63bf4b696 100644 (file)
--- a/app/views/site/_resize.html.erb
+++ b/app/views/site/_resize.html.erb
@@ -48,4 +48,9 @@
 
     resizeMap();
   }
+
+  $(document).ready(function () {
+    $("#sidebar").on("opened", resizeMap);
+    $("#sidebar").on("closed", resizeMap);
+  });
 </script>

diff --git a/app/views/site/_sidebar.html.erb b/app/views/site/_sidebar.html.erb
index 481f897957f91d4607279487b962fe37c971781a..5e91bec1c0290c24fcafa750cee50fd0aeb187c2 100644 (file)
--- a/app/views/site/_sidebar.html.erb
+++ b/app/views/site/_sidebar.html.erb
@@ -28,7 +28,7 @@
 
     $("#sidebar").css("display", "block");
 
-    <%= onopen %>
+    $("#sidebar").trigger("opened");
 
     onclose = options.onclose;
   }
@@ -36,7 +36,7 @@
   $(".sidebar_close").click(function (e) {
     $("#sidebar").css("display", "none");
 
-    <%= onclose %>
+    $("#sidebar").trigger("closed");
 
     if (onclose) {
        onclose();

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 5e091339c2ab828221065e7a7496aa9e0b23a786..45cc6c7f96d7c97a1b7a16956a08a1be7366b7d1 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -15,7 +15,7 @@
 <% end %>
 <% end %>
 
-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'sidebar' %>
 <%= render :partial => 'search' %>
 <%= render :partial => 'resize' %>
 

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index dc0e02f6faf747ec5397349b433b1f14554d9a90..877bc177190a471cd747a52ceb4c21031783b274 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -10,7 +10,7 @@
   <% end -%>
 <% end -%>
 
-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'sidebar' %>
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>