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

[rails.git] / app / assets / javascripts / index / directions.js

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 0c867a97d69b945661328a9e283522bc16d0762d..500610e26dfc9c4f3ed3529614f60c54a05a0757 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -265,17 +265,15 @@ OSM.Directions = function (map) {
       }
 
       var turnByTurnTable = $("<table class='mb-3'>");
+      var directionsCloseButton = $("<button type='button' class='btn-close'>");
 
       $("#sidebar_content")
         .empty()
         .append(
           $("<div class='d-flex'>").append(
-            $("<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'>")))),
+            $("<h2 class='flex-grow-1 text-break'>")
+              .text(I18n.t("javascripts.directions.directions")),
+            $("<div>").append(directionsCloseButton)),
           distanceText,
           turnByTurnTable
         );
@@ -327,8 +325,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);