From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 1 Sep 2022 08:17:11 +0000 (+0100)
Subject: Merge pull request #3672 from AntonKhorev/geolink-button
X-Git-Tag: live~1661
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/bf11e06e635ecb86e31f60c9dfc0e575c8f2a937?hp=6e144577aa5363d9b85a15631cf58d69a80295dd

Merge pull request #3672 from AntonKhorev/geolink-button

Remove geolink and close button nesting
---

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 0c867a97d..c5bd31940 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -265,6 +265,7 @@ OSM.Directions = function (map) {
       }
 
       var turnByTurnTable = $("<table class='mb-3'>");
+      var directionsCloseButton = $("<button type='button' class='btn-close mt-1'>");
 
       $("#sidebar_content")
         .empty()
@@ -273,9 +274,7 @@ OSM.Directions = function (map) {
             $("<div class='flex-grow-1 text-break'>").append(
               $("<h2>")
                 .text(I18n.t("javascripts.directions.directions"))),
-            $("<div>").append(
-              $("<a class='geolink' href='#'>").append(
-                $("<button type='button' class='btn-close mt-1'>")))),
+            $("<div>").append(directionsCloseButton)),
           distanceText,
           turnByTurnTable
         );
@@ -327,8 +326,7 @@ OSM.Directions = function (map) {
         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");
 
-      $("#sidebar_content a.geolink").on("click", function (e) {
-        e.preventDefault();
+      directionsCloseButton.on("click", function () {
         map.removeLayer(polyline);
         $("#sidebar_content").html("");
         map.setSidebarOverlaid(true);
diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb
index 307903fff..87d0b8955 100644
--- a/app/views/application/_sidebar_header.html.erb
+++ b/app/views/application/_sidebar_header.html.erb
@@ -3,8 +3,6 @@
     <h2><%= title %></h2>
   </div>
   <div>
-    <a class="geolink" href="<%= root_path %>">
-      <button type="button" class="btn-close mt-1"></button>
-    </a>
+    <a class="geolink d-block btn-close mt-1" href="<%= root_path %>"></a>
   </div>
 </div>