Fix remaining tooltips, and add tests

These were broken during the upgrade to bootstrap 5

Fixes #3632
This commit is contained in:
Andy Allan 2022-08-03 15:20:17 +01:00
parent cbb8772685
commit 68776e378c
5 changed files with 35 additions and 4 deletions

View file

@ -59,7 +59,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
var editDisabled = zoom < 13; var editDisabled = zoom < 13;
$("#edit_tab") $("#edit_tab")
.tooltip({ placement: "bottom" }) .tooltip({ placement: "bottom" })
.attr("data-original-title", editDisabled ? .attr("data-bs-original-title", editDisabled ?
I18n.t("javascripts.site.edit_disabled_tooltip") : "") I18n.t("javascripts.site.edit_disabled_tooltip") : "")
// Disable the button group and also the buttons to avoid // Disable the button group and also the buttons to avoid
// inconsistent behaviour when zooming // inconsistent behaviour when zooming

View file

@ -171,7 +171,7 @@ L.OSM.layers = function (options) {
} }
$(item).attr("class", disabled ? "disabled" : ""); $(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") : ""); I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
}); });
}; };

View file

@ -17,7 +17,7 @@ L.OSM.note = function (options) {
var disabled = OSM.STATUS === "database_offline" || map.getZoom() < 12; var disabled = OSM.STATUS === "database_offline" || map.getZoom() < 12;
link link
.toggleClass("disabled", disabled) .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_disabled_tooltip" :
"javascripts.site.createnote_tooltip")); "javascripts.site.createnote_tooltip"));
} }

View file

@ -20,7 +20,7 @@ L.OSM.query = function (options) {
isDisabled = map.getZoom() < 14; isDisabled = map.getZoom() < 14;
link link
.toggleClass("disabled", isDisabled) .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_disabled_tooltip" :
"javascripts.site.queryfeature_tooltip")); "javascripts.site.queryfeature_tooltip"));

View file

@ -37,4 +37,35 @@ class SiteTest < ApplicationSystemTestCase
tooltip.assert_text "Map Key" tooltip.assert_text "Map Key"
tooltip.assert_text "not available" tooltip.assert_text "not available"
end end
test "tooltip shows for query button when zoomed in" do
visit "/#map=14/0/0"
assert_no_selector ".tooltip"
button = find ".control-query .control-button"
button.hover
tooltip = find ".tooltip"
tooltip.assert_text "Query features"
tooltip.assert_no_text "Zoom in"
end
test "tooltip shows for query button when zoomed out" do
visit "/#map=10/0/0"
assert_no_selector ".tooltip"
button = find ".control-query .control-button"
button.hover
tooltip = find ".tooltip"
tooltip.assert_text "Zoom in to query features"
end
test "tooltip shows for edit button when zoomed out" do
visit "/#map=11/0/0"
assert_no_selector ".tooltip"
button = find "#edit_tab"
button.hover
tooltip = find ".tooltip"
tooltip.assert_text "Zoom in to edit the map"
end
end end