From 11af8512489b43c794d003e3cae945bb5793943e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 5 Mar 2015 00:34:06 +0000 Subject: [PATCH] Remove duplicate search handlers Fixes #922 --- app/assets/javascripts/index.js | 20 -------------------- app/assets/javascripts/index/search.js | 7 ++++--- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 9a05b62c2..9e386d54b 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -355,24 +355,4 @@ $(document).ready(function () { if (OSM.router.route(this.pathname + this.search + this.hash)) e.preventDefault(); }); - - $(".search_form").on("submit", function(e) { - e.preventDefault(); - $("header").addClass("closed"); - var query = $(this).find("input[name=query]").val(); - if (query) { - OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); - } else { - OSM.router.route("/"); - } - }); - - $(".describe_location").on("click", function(e) { - e.preventDefault(); - var center = map.getCenter().wrap(), - precision = OSM.zoomPrecision(map.getZoom()); - OSM.router.route("/search?query=" + encodeURIComponent( - center.lat.toFixed(precision) + "," + center.lng.toFixed(precision) - )); - }); }); diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index b829b582c..485920c8e 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -32,10 +32,11 @@ OSM.Search = function(map) { $(".describe_location").on("click", function(e) { e.preventDefault(); - var precision = OSM.zoomPrecision(map.getZoom()); + var center = map.getCenter().wrap(), + precision = OSM.zoomPrecision(map.getZoom()); OSM.router.route("/search?query=" + encodeURIComponent( - map.getCenter().lat.toFixed(precision) + "," + - map.getCenter().lng.toFixed(precision))); + center.lat.toFixed(precision) + "," + center.lng.toFixed(precision) + )); }); $("#sidebar_content") -- 2.43.2