From 039a7d6af7408de12854034fdb31a96977affed0 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 27 Apr 2024 06:58:59 +0300 Subject: [PATCH] Stretch query result links, listen to their over/out events, don't simulate clicks --- app/assets/javascripts/index/query.js | 27 ++++++--------------------- app/assets/stylesheets/common.scss | 8 -------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 08da06d4c..a7d228ff9 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,4 +1,3 @@ -//= require jquery-simulate/jquery.simulate //= require qs/dist/qs OSM.Query = function (map) { @@ -52,23 +51,8 @@ OSM.Query = function (map) { } $("#sidebar_content") - .on("mouseover", ".query-results li.query-result", showResultGeometry) - .on("mouseout", ".query-results li.query-result", hideResultGeometry) - .on("mousedown", ".query-results li.query-result", function () { - var moved = false; - $(this).one("click", function (e) { - if (!moved) { - var geometry = $(this).data("geometry"); - if (geometry) map.removeLayer(geometry); - - if (!$(e.target).is("a")) { - $(this).find("a").simulate("click", e); - } - } - }).one("mousemove", function () { - moved = true; - }); - }); + .on("mouseover", ".query-results a", showResultGeometry) + .on("mouseout", ".query-results a", hideResultGeometry); function interestingFeature(feature) { if (feature.tags) { @@ -216,13 +200,14 @@ OSM.Query = function (map) { if (interestingFeature(element)) { var $li = $("
  • ") - .addClass("query-result list-group-item list-group-item-action") - .data("geometry", featureGeometry(element)) + .addClass("list-group-item list-group-item-action") .text(featurePrefix(element) + " ") .appendTo($ul); $("") + .addClass("stretched-link") .attr("href", "/" + element.type + "/" + element.id) + .data("geometry", featureGeometry(element)) .text(featureName(element)) .appendTo($li); } @@ -367,7 +352,7 @@ OSM.Query = function (map) { page.unload = function (sameController) { if (!sameController) { disableQueryMode(); - $("#sidebar_content .query-results li.query-result.selected").each(hideResultGeometry); + $("#sidebar_content .query-results a.selected").each(hideResultGeometry); } }; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c3f714389..fc1ef6926 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -644,14 +644,6 @@ tr.turn { .query-results { display: none; - - ul { - li { - &.query-result { - cursor: pointer; - } - } - } } } -- 2.45.2