From ecf3bdf2af857f17113926a4636bfc77e7c96428 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 3 Dec 2013 15:14:59 +0000 Subject: [PATCH 1/1] Remove unused code for handling search results in Potlatch --- app/views/site/_potlatch.html.erb | 18 +++++------------- app/views/site/_potlatch2.html.erb | 20 +++++--------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index b82a82944..7c16b40b8 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -52,17 +52,9 @@ } var mapParams = OSM.mapParams(); - <% if @lat && @lon -%> - doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>); - <% else -%> - doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17); - <% end -%> - - $(document).ready(function () { - $("body").on("click", "a.set_position", function () { - var data = $(this).data(); - - doSWF(data.lat, data.lon, data.zoom || 15); - }); - }); +<% if @lat && @lon -%> + doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>); +<% else -%> + doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17); +<% end -%> diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index bb811d652..69940c8ea 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -71,21 +71,11 @@ } var mapParams = OSM.mapParams(); - <% if @lat && @lon -%> - doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>); - <% else -%> - doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17); - <% end -%> - - $("body").on("click", "a.set_position", function (e) { - e.preventDefault(); - - var data = $(this).data(); - - $("#potlatch").each(function () { - this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13)); - }); - }); +<% if @lat && @lon -%> + doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>); +<% else -%> + doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17); +<% end -%> var mapMoved = $.throttle(250, function(lon, lat, zoom) { updateLinks({ lon: lon, lat: lat }, zoom); -- 2.43.2