X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9657b92faddc9fa9bf765fc7de06aa0a9042e8e9..ef5352332e02c2f3a9c9d5cc7594ec8da02cb64e:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8b8beb5b4..054742126 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,8 +16,6 @@ //= require matomo //= require richtext //= require qs/dist/qs -//= require bs-custom-file-input -//= require bs-custom-file-input-init /* * Called as the user scrolls/zooms around to manipulate hrefs of the @@ -33,6 +31,7 @@ window.updateLinks = function (loc, zoom, layers, object) { delete args.way; delete args.relation; delete args.changeset; + delete args.note; if (object && editlink) { args[object.type] = object.id; @@ -56,33 +55,21 @@ window.updateLinks = function (loc, zoom, layers, object) { link.href = href; }); + // Disable the button group and also the buttons to avoid + // inconsistent behaviour when zooming var editDisabled = zoom < 13; - var editTab = $("#edit_tab"); - editTab - // Disable the button group and also the buttons to avoid - // inconsistent behaviour when zooming + $("#edit_tab") + .tooltip({ placement: "bottom" }) + .tooltip(editDisabled ? "enable" : "disable") .toggleClass("disabled", editDisabled) .find("a") .toggleClass("disabled", editDisabled); - var editTooltip = bootstrap.Tooltip.getOrCreateInstance(editTab[0], { placement: "bottom" }); - if (editDisabled) { - editTooltip.enable(); - } else { - editTooltip.disable(); - } -}; - -window.maximiseMap = function () { - $("#content").addClass("maximised"); -}; - -window.minimiseMap = function () { - $("#content").removeClass("maximised"); }; $(document).ready(function () { - $("#edit_tab") - .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip")); + // NB: Turns Turbo Drive off by default. Turbo Drive must be opt-in on a per-link and per-form basis + // See https://turbo.hotwired.dev/reference/drive#turbo.session.drive + Turbo.session.drive = false; var headerWidth = 0, compactWidth = 0; @@ -118,9 +105,13 @@ $(document).ready(function () { $("body").removeClass("compact-nav"); + $("header").removeClass("text-nowrap"); + $("header nav.secondary > ul").removeClass("flex-nowrap"); + updateHeader(); $(window).resize(updateHeader); + $(document).on("turbo:render", updateHeader); }, 0); $("#menu-icon").on("click", function (e) { @@ -139,6 +130,7 @@ $(document).ready(function () { I18n.fallbacks = true; OSM.preferred_editor = application_data.preferredEditor; + OSM.preferred_languages = application_data.preferredLanguages; if (application_data.user) { OSM.user = application_data.user; @@ -151,4 +143,7 @@ $(document).ready(function () { if (application_data.location) { OSM.location = application_data.location; } + + $("#edit_tab") + .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip")); });