X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98..79447e75497601444a9d4de25220f24a609d2780:/app/assets/javascripts/index/search.js diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index ba66f4782..10750b5b7 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); @@ -45,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")) { @@ -123,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);