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

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 84f0d3ab47af361dfb91daff947ba0e79ed90299..712f62fd55e251b0ece65ec83653ef63b02b52c2 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -54,7 +54,7 @@ OSM.Search = function (map) {
     const div = $(this).parents(".search_more");
 
     $(this).hide();
-    div.find(".loader").show();
+    div.find(".loader").prop("hidden", false);
 
     fetch($(this).attr("href"), {
       method: "POST",

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 9075c5864af3eab7338a7c55d5fe6f40ffd343f9..2cfd5eba732348b338be53952e627319efc59f5c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -580,14 +580,6 @@ header .search_forms,
   }
 }
 
-/* Rules for search sidebar */
-
-#sidebar .search_results_entry {
-  .search_more .loader {
-    display: none;
-  }
-}
-
 /* Rules for routing */
 
 td.distance {

diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb
index 05d7d5d637e8e1dee29c2832a99d5de21b52c834..35fcea5286e3d2f8a762741d6d233f872d07f6d1 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -13,7 +13,7 @@
   <% if @more_params %>
     <div class="search_more text-center my-3">
       <%= link_to t(".more_results"), url_for(@more_params), :class => "btn btn-primary" %>
-      <div class="text-center loader">
+      <div class="text-center loader" hidden>
         <div class="spinner-border" role="status">
           <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
         </div>

diff --git a/test/system/history_test.rb b/test/system/history_test.rb
index 01652b6b08cda11fd0b15a0ac7d04b9cd1a10549..24eb446530befd12e0bab50c883a2f136c5d2579 100644 (file)
--- a/test/system/history_test.rb
+++ b/test/system/history_test.rb
@@ -179,8 +179,14 @@ class HistoryTest < ApplicationSystemTestCase
   test "changeset bbox is shown on the map and clickable" do
     user = create(:user)
     changeset = create(:changeset, :user => user, :num_changes => 1, :bbox => [50, 50, 51, 51])
+    create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "Clickable changeset")
 
     visit "#{user_path(user)}/history"
+
+    within_sidebar do
+      assert_link "Clickable changeset"
+    end
+
     find_by_id("map").click
 
     assert_current_path changeset_path(changeset)