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

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

Browse source 
Fix tooltips
This commit is contained in:
Andy Allan 2022-08-03 15:38:58 +01:00 • committed by GitHub
commit e443ec7587
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/application.js
View file

@ -59,7 +59,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
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

2
app/assets/javascripts/leaflet.key.js
View file

@ -62,7 +62,7 @@ L.OSM.key = function (options) {
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"));

2
app/assets/javascripts/leaflet.layers.js
View file

@ -170,7 +170,7 @@ L.OSM.layers = function (options) {
}
$(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") : "");
});
};

2
app/assets/javascripts/leaflet.note.js
View file

@ -17,7 +17,7 @@ L.OSM.note = function (options) {
var disabled = OSM.STATUS === "database_offline" || map.getZoom() < 12;
link
.toggleClass("disabled", disabled)
.attr("data-original-title", I18n.t(disabled ?
.attr("data-bs-original-title", I18n.t(disabled ?
"javascripts.site.createnote_disabled_tooltip" :
"javascripts.site.createnote_tooltip"));
}

2
app/assets/javascripts/leaflet.query.js
View file

@ -20,7 +20,7 @@ L.OSM.query = function (options) {
isDisabled = map.getZoom() < 14;
link
.toggleClass("disabled", isDisabled)
.attr("data-original-title", I18n.t(isDisabled ?
.attr("data-bs-original-title", I18n.t(isDisabled ?
"javascripts.site.queryfeature_disabled_tooltip" :
"javascripts.site.queryfeature_tooltip"));