X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73c95847a6680bea7f35fe5b3da6eb4e52757b9c..dbe84a97bf48789e0f32a185f701840fc68063bd:/app/assets/javascripts/index/search.js?ds=sidebyside diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index 9ed243466..1c1da3677 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,9 +1,7 @@ -//= require jquery.simulate -//= require querystring +//= require jquery-simulate/jquery.simulate +//= require qs/dist/qs OSM.Search = function (map) { - var querystring = require("querystring-component"); - $(".search_form input[name=query]").on("input", function (e) { if ($(e.target).val() === "") { $(".describe_location").fadeIn(100); @@ -64,13 +62,23 @@ OSM.Search = function (map) { e.preventDefault(); e.stopPropagation(); - var div = $(this).parents(".search_more"); + var div = $(this).parents(".search_more"), + csrf_param = $("meta[name=csrf-param]").attr("content"), + csrf_token = $("meta[name=csrf-token]").attr("content"), + params = {}; $(this).hide(); div.find(".loader").show(); - $.get($(this).attr("href"), function (data) { - div.replaceWith(data); + params[csrf_param] = csrf_token; + + $.ajax({ + url: $(this).attr("href"), + method: "POST", + data: params, + success: function (data) { + div.replaceWith(data); + } }); } @@ -123,7 +131,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); @@ -131,17 +139,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