X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c4c0e8105a8edc35205add749f461ec7be689aef..8919c8c40416a70e1a5516f03e2628c5dd380d40:/app/assets/javascripts/index/search.js diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index a3e53382a..b7bca1d2a 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,4 +1,5 @@ -//= require jquery.simulate +//= require jquery-simulate/jquery.simulate +//= require qs/dist/qs OSM.Search = function (map) { $(".search_form input[name=query]").on("input", function (e) { @@ -42,9 +43,9 @@ OSM.Search = function (map) { $("#sidebar_content") .on("click", ".search_more a", clickSearchMore) .on("click", ".search_results_entry a.set_position", clickSearchResult) - .on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult) - .on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult) - .on("mousedown", "p.search_results_entry:has(a.set_position)", function () { + .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult) + .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult) + .on("mousedown", "li.search_results_entry:has(a.set_position)", function () { var moved = false; $(this).one("click", function (e) { if (!moved && !$(e.target).is("a")) { @@ -120,7 +121,7 @@ OSM.Search = function (map) { var page = {}; page.pushstate = page.popstate = function (path) { - var params = querystring.parse(path.substring(path.indexOf("?") + 1)); + var params = Qs.parse(path.substring(path.indexOf("?") + 1)); $(".search_form input[name=query]").val(params.query); $(".describe_location").hide(); OSM.loadSidebarContent(path, page.load); @@ -128,17 +129,21 @@ OSM.Search = function (map) { page.load = function () { $(".search_results_entry").each(function (index) { - var entry = $(this); + var entry = $(this), + csrf_param = $("meta[name=csrf-param]").attr("content"), + csrf_token = $("meta[name=csrf-token]").attr("content"), + params = { + zoom: map.getZoom(), + minlon: map.getBounds().getWest(), + minlat: map.getBounds().getSouth(), + maxlon: map.getBounds().getEast(), + maxlat: map.getBounds().getNorth() + }; + params[csrf_param] = csrf_token; $.ajax({ url: entry.data("href"), - method: "GET", - data: { - zoom: map.getZoom(), - minlon: map.getBounds().getWest(), - minlat: map.getBounds().getSouth(), - maxlon: map.getBounds().getEast(), - maxlat: map.getBounds().getNorth() - }, + method: "POST", + data: params, success: function (html) { entry.html(html); // go to first result of first geocoder