Remove geolink and close button nesting

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 0c867a97d69b945661328a9e283522bc16d0762d..c5bd3194052bf8e9e67ed980a7580313d81288e9 100644 (file)
--- 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 turnByTurnTable = $("<table class='mb-3'>");

+      var directionsCloseButton = $("<button type='button' class='btn-close mt-1'>");

 
       $("#sidebar_content")
         .empty()
 
       $("#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 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
         );
           distanceText,
           turnByTurnTable
         );


@@ -327,8 +326,7 @@ OSM.Directions = function (map) {
         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");
 
         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);
         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 307903fffca8f1d91efb170605dcb1218bbd42d6..87d0b8955ba69adab3f7bc3373ed0e818aa33f55 100644 (file)
--- 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>
     <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>
   </div>
 </div>