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

Fix zoom level related tooltips except for layer checkboxes

Browse source
This commit is contained in:
Anton Khorev 2022-07-29 18:07:32 +03:00
parent cbb8772685
commit 31a39d3479
5 changed files with 18 additions and 3 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; 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

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

@ -171,6 +171,7 @@ L.OSM.layers = function (options) {
} }
$(item).attr("class", disabled ? "disabled" : ""); $(item).attr("class", disabled ? "disabled" : "");
// item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
item.attr("data-original-title", disabled ? item.attr("data-original-title", disabled ?
I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : ""); 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; 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"));
} }

2
app/assets/javascripts/leaflet.query.js
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"));

14
test/system/site_test.rb
View file

@ -37,4 +37,18 @@ 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
[
"#edit_tab",
".control-note .control-button",
".control-query .control-button"
].each do |selector|
test "tooltips on low zoom levels for disabled control '#{selector}'" do
visit "/#map=1/1/1"
assert_no_selector ".tooltip"
find(selector).hover
assert_selector ".tooltip", :text => "Zoom in"
end
end
end end