X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5bd59e19368d8761a7dbaa5db0e8833174c11f36..c8e21c409c9bec446f0caa2526d5b07861bb3299:/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 fa9546f4e..10750b5b7 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) { @@ -33,7 +34,7 @@ OSM.Search = function (map) { $(".describe_location").on("click", function (e) { e.preventDefault(); var center = map.getCenter().wrap(), - precision = OSM.zoomPrecision(map.getZoom()); + precision = OSM.zoomPrecision(map.getZoom()); OSM.router.route("/search?whereami=1&query=" + encodeURIComponent( center.lat.toFixed(precision) + "," + center.lng.toFixed(precision) )); @@ -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);