From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 Aug 2012 19:27:11 +0000 (+0100)
Subject: Use custom events to resize the map on sidebar open/close
X-Git-Tag: live~5422
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/434e603cd6ab73ac37b2919c89c09bfbf6e8fe62?ds=sidebyside

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 f26e2248c..3e371a417 100644
--- 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 481f89795..5e91bec1c 100644
--- 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 5e091339c..45cc6c7f9 100644
--- 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 dc0e02f6f..877bc1771 100644
--- 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' %>