cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3672 from AntonKhorev/geolink-button

Browse source 
Remove geolink and close button nesting
This commit is contained in:
Andy Allan 2022-09-01 09:17:11 +01:00 • committed by GitHub
commit bf11e06e63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/index/directions.js
View file

@ -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") $("#sidebar_content")
.empty() .empty()
@ -273,9 +274,7 @@ OSM.Directions = function (map) {
$("<div class='flex-grow-1 text-break'>").append( $("<div class='flex-grow-1 text-break'>").append(
$("<h2>") $("<h2>")
.text(I18n.t("javascripts.directions.directions"))), .text(I18n.t("javascripts.directions.directions"))),
$("<div>").append( $("<div>").append(directionsCloseButton)),
$("<a class='geolink' href='#'>").append(
$("<button type='button' class='btn-close mt-1'>")))),
distanceText, distanceText,
turnByTurnTable turnByTurnTable
); );
@ -327,8 +326,7 @@ OSM.Directions = function (map) {
I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) + I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
"</p>"); "</p>");
$("#sidebar_content a.geolink").on("click", function (e) { directionsCloseButton.on("click", function () {
e.preventDefault();
map.removeLayer(polyline); map.removeLayer(polyline);
$("#sidebar_content").html(""); $("#sidebar_content").html("");
map.setSidebarOverlaid(true); map.setSidebarOverlaid(true);

4
app/views/application/_sidebar_header.html.erb
View file

@ -3,8 +3,6 @@
<h2><%= title %></h2> <h2><%= title %></h2>
</div> </div>
<div> <div>
<a class="geolink" href="<%= root_path %>"> <a class="geolink d-block btn-close mt-1" href="<%= root_path %>"></a>
<button type="button" class="btn-close mt-1"></button>
</a>
</div> </div>
</div> </div>