From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 30 Aug 2012 16:52:08 +0000 (-0700)
Subject: Eliminate interpolation in key JS
X-Git-Tag: live~5418
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e83fba2b4786c8ade4472342758f0487272e6874?hp=d7da1562c3b3c7544e3899e7bc49f7b32c2d2d19

Eliminate interpolation in key JS
---

diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb
index b596692ee..1129f69d2 100644
--- a/app/views/site/_key.html.erb
+++ b/app/views/site/_key.html.erb
@@ -1,16 +1,18 @@
 <script type="text/javascript">
 $(document).ready(function () {
-  var updateMapKey = function () {
-    $("#sidebar_content").load("<%= url_for :action => :key %>", {
-      layer: map.baseLayer.keyid,
-      zoom: map.getZoom()
-    });
-  }
+  $("#open_map_key").click(function (e) {
+    var url = $(this).attr('href'),
+        title = $(this).text();
 
-  $("#open_map_key").click(function () {
-    updateMapKey();
+    function updateMapKey() {
+      $("#sidebar_content").load(url, {
+        layer: map.baseLayer.keyid,
+        zoom: map.getZoom()
+      });
+    }
 
-    openSidebar({ title: "<%= t('site.key.map_key') %>" });
+    updateMapKey();
+    openSidebar({ title: title });
 
     $("#sidebar").one("closed", function () {
       map.events.unregister("zoomend", map, updateMapKey);
@@ -19,10 +21,12 @@ $(document).ready(function () {
 
     map.events.register("zoomend", map, updateMapKey);
     map.events.register("changelayer", map, updateMapKey);
+
+    e.preventDefault();
   });
 });
 </script>
 
 <% content_for :left_menu do %>
-  <li><%= link_to t("site.key.map_key"), "#", :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></li>
+  <li><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></li>
 <% end %>