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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 49266f919f374770f0b7463020c0dae762e4e424..38c4981696f5d37aacc066769169cd136c61a179 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -406,4 +406,8 @@ $(document).ready(function () {
       e.preventDefault();
     }
   });
+
+  $(document).on("click", "#sidebar_content .btn-close", function () {
+    OSM.router.route("/" + OSM.formatHash(map));
+  });
 });

diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb
index ed88a5ae3e0caea234671993664cd80da34fa629..868442c3ed8cbaf9fa209341c03269c71ba775f1 100644 (file)
--- a/app/views/application/_sidebar_header.html.erb
+++ b/app/views/application/_sidebar_header.html.erb
@@ -1,6 +1,6 @@
 <div class="d-flex w-100">
   <h2 class="flex-grow-1 text-break"><%= title %></h2>
   <div>
-    <a class="geolink d-block btn-close" href="<%= root_path %>"></a>
+    <button type="button" class="btn-close"></button>
   </div>
 </div>