cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/2509'

Browse source
This commit is contained in:
Tom Hughes 2020-01-16 11:42:12 +00:00
commit d122ea16f8
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/index/query.js
View file

@ -228,12 +228,14 @@ OSM.Query = function (map) {
if (results.remark) { if (results.remark) {
$("<li>") $("<li>")
.addClass("query-result list-group-item")
.text(I18n.t("javascripts.query.error", { server: url, error: results.remark })) .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
.appendTo($ul); .appendTo($ul);
} }
if ($ul.find("li").length === 0) { if ($ul.find("li").length === 0) {
$("<li>") $("<li>")
.addClass("query-result list-group-item")
.text(I18n.t("javascripts.query.nothing_found")) .text(I18n.t("javascripts.query.nothing_found"))
.appendTo($ul); .appendTo($ul);
} }
@ -242,6 +244,7 @@ OSM.Query = function (map) {
$section.find(".loader").stopTime("loading").hide(); $section.find(".loader").stopTime("loading").hide();
$("<li>") $("<li>")
.addClass("query-result list-group-item")
.text(I18n.t("javascripts.query." + status, { server: url, error: error })) .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
.appendTo($ul); .appendTo($ul);
} }

6
app/assets/javascripts/index/search.js
View file

@ -45,9 +45,9 @@ OSM.Search = function (map) {
$("#sidebar_content") $("#sidebar_content")
.on("click", ".search_more a", clickSearchMore) .on("click", ".search_more a", clickSearchMore)
.on("click", ".search_results_entry a.set_position", clickSearchResult) .on("click", ".search_results_entry a.set_position", clickSearchResult)
.on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult) .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
.on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult) .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult)
.on("mousedown", "p.search_results_entry:has(a.set_position)", function () { .on("mousedown", "li.search_results_entry:has(a.set_position)", function () {
var moved = false; var moved = false;
$(this).one("click", function (e) { $(this).one("click", function (e) {
if (!moved && !$(e.target).is("a")) { if (!moved && !$(e.target).is("a")) {

7
app/assets/stylesheets/common.scss
View file

@ -939,15 +939,8 @@ header .search_forms,
/* Rules for search sidebar */ /* Rules for search sidebar */
#sidebar .search_results_entry { #sidebar .search_results_entry {
ul {
padding: 0;
}
ul li { ul li {
border-bottom: $keyline;
cursor: pointer; cursor: pointer;
list-style-type: none;
&:first-child { border-top: $keyline; }
&.selected { background: $list-highlight; } &.selected { background: $list-highlight; }
} }

10
app/views/geocoder/results.html.erb
View file

@ -1,9 +1,13 @@
<% if @results.empty? %> <% if @results.empty? %>
<p class="search_results_entry inner12"><%= t ".no_results" %></p> <ul class="list-group list-group-flush">
<li class="list-group-item">
<%= t ".no_results" %>
</li>
</ul>
<% else %> <% else %>
<ul class='results-list'> <ul class='results-list list-group list-group-flush'>
<% @results.each do |result| %> <% @results.each do |result| %>
<li><p class="inner12 search_results_entry clearfix"><%= result_to_html(result) %></p></li> <li class="list-group-item search_results_entry"><%= result_to_html(result) %></li>
<% end %> <% end %>
</ul> </ul>
<% if @more_params %> <% if @more_params %>

4
test/controllers/geocoder_controller_test.rb
View file

@ -489,11 +489,11 @@ class GeocoderControllerTest < ActionController::TestCase
assert_select "ul.results-list", 0 assert_select "ul.results-list", 0
else else
assert_select "ul.results-list", 1 do assert_select "ul.results-list", 1 do
assert_select "p.search_results_entry", results.count assert_select "li.search_results_entry", results.count
results.each do |result| results.each do |result|
attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join("") attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join("")
assert_select "p.search_results_entry a.set_position#{attrs}", result[:name] assert_select "li.search_results_entry a.set_position#{attrs}", result[:name]
end end
end end
end end