X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..1e332721531b9b3baa1a8795a718cdeffdb2bd40:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e99a8f351..f3ca5f37f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,43 +1,45 @@ //= 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 +//= require bs-custom-file-input +//= require bs-custom-file-input-init /* - * Called as the user scrolls/zooms around to maniplate hrefs of the + * Called as the user scrolls/zooms around to manipulate hrefs of the * view tab and various other links */ 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,14 +57,15 @@ 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") : ""); + .find("a") + .toggleClass("disabled", editDisabled); }; window.maximiseMap = function () { @@ -81,11 +84,11 @@ $(document).ready(function () { var windowWidth = $(window).width(); if (windowWidth < compactWidth) { - $("body").removeClass("compact").addClass("small"); + $("body").removeClass("compact-nav").addClass("small-nav"); } else if (windowWidth < headerWidth) { - $("body").addClass("compact").removeClass("small"); + $("body").addClass("compact-nav").removeClass("small-nav"); } else { - $("body").removeClass("compact").removeClass("small"); + $("body").removeClass("compact-nav").removeClass("small-nav"); } } @@ -100,13 +103,13 @@ $(document).ready(function () { headerWidth = headerWidth + $(e).outerWidth(); }); - $("body").addClass("compact"); + $("body").addClass("compact-nav"); $("header").children(":visible").each(function (i, e) { compactWidth = compactWidth + $(e).outerWidth(); }); - $("body").removeClass("compact"); + $("body").removeClass("compact-nav"); updateHeader(); @@ -141,4 +144,7 @@ $(document).ready(function () { if (application_data.location) { OSM.location = application_data.location; } + + $("#edit_tab") + .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip")); });