From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 3 Aug 2022 14:38:58 +0000 (+0100)
Subject: Merge pull request #3634 from AntonKhorev/map-key-tooltip
X-Git-Tag: live~2000
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e443ec7587e78564deadd34f0aebde02c83437cc?hp=-c

Merge pull request #3634 from AntonKhorev/map-key-tooltip

Fix tooltips
---

e443ec7587e78564deadd34f0aebde02c83437cc
diff --combined app/assets/javascripts/application.js
index aea9e01a4,740990fb3..89f60847f
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@@ -13,7 -13,7 +13,7 @@@
  //= require leaflet.locationfilter
  //= require i18n
  //= require oauth
 -//= require piwik
 +//= require matomo
  //= require richtext
  //= require qs/dist/qs
  //= require bs-custom-file-input
@@@ -59,7 -59,7 +59,7 @@@ window.updateLinks = function (loc, zoo
    var editDisabled = zoom < 13;
    $("#edit_tab")
      .tooltip({ placement: "bottom" })
-     .attr("data-original-title", editDisabled ?
+     .attr("data-bs-original-title", editDisabled ?
        I18n.t("javascripts.site.edit_disabled_tooltip") : "")
      // Disable the button group and also the buttons to avoid
      // inconsistent behaviour when zooming
diff --combined app/assets/javascripts/leaflet.key.js
index b9b7c9c04,e170ff352..367c39c14
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@@ -19,8 -19,9 +19,8 @@@ L.OSM.key = function (options) 
        .attr("class", "sidebar_heading")
        .appendTo($ui)
        .append(
 -        $("<span>")
 -          .text(I18n.t("javascripts.close"))
 -          .attr("class", "icon close")
 +        $("<button type='button' class='btn-close float-end mt-1'>")
 +          .attr("aria-label", I18n.t("javascripts.close"))
            .bind("click", toggle))
        .append(
          $("<h4>")
@@@ -62,7 -63,7 +62,7 @@@
        var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;
        button
          .toggleClass("disabled", disabled)
-         .attr("data-original-title",
+         .attr("data-bs-original-title",
                I18n.t(disabled ?
                  "javascripts.key.tooltip_disabled" :
                  "javascripts.key.tooltip"));
diff --combined app/assets/javascripts/leaflet.layers.js
index 676cd9607,0f8e6c4d2..038205ca4
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@@ -22,8 -22,9 +22,8 @@@ L.OSM.layers = function (options) 
        .attr("class", "sidebar_heading")
        .appendTo($ui)
        .append(
 -        $("<span>")
 -          .text(I18n.t("javascripts.close"))
 -          .attr("class", "icon close")
 +        $("<button type='button' class='btn-close float-end mt-1'>")
 +          .attr("aria-label", I18n.t("javascripts.close"))
            .bind("click", toggle))
        .append(
          $("<h4>")
@@@ -170,7 -171,7 +170,7 @@@
            }
  
            $(item).attr("class", disabled ? "disabled" : "");
-           item.attr("data-original-title", disabled ?
+           item.attr("data-bs-original-title", disabled ?
              I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
          });
        };