X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a47d6c212da842a552876737c6fb2373555f3feb..bf5f842c23a469cf2098ae7953f1f8cd9534e361:/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 3892d01a0..7fb8edbb0 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,11 +1,30 @@ OSM.Search = function(map) { - $(".search_form input[name=query]") - .on("focus", function() { - $(".describe_location").fadeOut(100); - }) - .on("blur", function() { + $(".search_form input[name=query]").on("input", function(e) { + if ($(e.target).val() == "") { $(".describe_location").fadeIn(100); - }); + } else { + $(".describe_location").fadeOut(100); + } + }); + + $(".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("/" + OSM.formatHash(map)); + } + }); + + $(".describe_location").on("click", function(e) { + e.preventDefault(); + var precision = OSM.zoomPrecision(map.getZoom()); + OSM.router.route("/search?query=" + encodeURIComponent( + map.getCenter().lat.toFixed(precision) + "," + + map.getCenter().lng.toFixed(precision))); + }); $("#sidebar_content") .on("click", ".search_more a", clickSearchMore) @@ -80,6 +99,7 @@ OSM.Search = function(map) { map.removeLayer(marker); map.removeObject(); $(".search_form input[name=query]").val(""); + $(".describe_location").fadeIn(100); }; return page;