X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cc4e933479b7e74ed7d4425909f0915717fc1db..f8b04635a79cf23a30ae1c80029d8c33f34f8424:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 36b560fde..ead01a8ff 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,21 +1,20 @@ //= require jquery3 //= require jquery_ujs -//= require jquery.timers -//= require jquery.cookie //= require jquery.throttle-debounce +//= require js-cookie/dist/js.cookie //= require popper //= require bootstrap-sprockets //= require osm -//= require leaflet +//= require leaflet/dist/leaflet-src //= require leaflet.osm //= require leaflet.map //= require leaflet.zoom //= require leaflet.locationfilter //= require i18n //= require oauth -//= require piwik +//= require matomo //= require richtext -//= require querystring +//= require qs/dist/qs /* * Called as the user scrolls/zooms around to manipulate hrefs of the @@ -23,21 +22,21 @@ */ window.updateLinks = function (loc, zoom, layers, object) { $(".geolink").each(function (index, link) { - var querystring = require("querystring-component"), - href = link.href.split(/[?#]/)[0], - args = querystring.parse(link.search.substring(1)), + var href = link.href.split(/[?#]/)[0], + args = Qs.parse(link.search.substring(1)), editlink = $(link).hasClass("editlink"); delete args.node; delete args.way; delete args.relation; delete args.changeset; + delete args.note; if (object && editlink) { args[object.type] = object.id; } - var query = querystring.stringify(args); + var query = Qs.stringify(args); if (query) href += "?" + query; args = { @@ -55,25 +54,22 @@ 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; $("#edit_tab") .tooltip({ placement: "bottom" }) - .off("click.minzoom") - .on("click.minzoom", function () { return !editDisabled; }) + .tooltip(editDisabled ? "enable" : "disable") .toggleClass("disabled", editDisabled) - .attr("data-original-title", editDisabled ? - I18n.t("javascripts.site.edit_disabled_tooltip") : ""); -}; - -window.maximiseMap = function () { - $("#content").addClass("maximised"); -}; - -window.minimiseMap = function () { - $("#content").removeClass("maximised"); + .find("a") + .toggleClass("disabled", editDisabled); }; $(document).ready(function () { + // 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; @@ -108,9 +104,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) { @@ -129,6 +129,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; @@ -141,4 +142,7 @@ $(document).ready(function () { if (application_data.location) { OSM.location = application_data.location; } + + $("#edit_tab") + .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip")); });