X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..be541bcab21487560d4974215bd35be74012c492:/app/assets/javascripts/application.js?ds=inline diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cbb69119c..f3ca5f37f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,8 +1,8 @@ //= require jquery3 //= require jquery_ujs //= require jquery.timers -//= require jquery.cookie/jquery.cookie //= require jquery.throttle-debounce +//= require js-cookie/dist/js.cookie //= require popper //= require bootstrap-sprockets //= require osm @@ -13,7 +13,7 @@ //= require leaflet.locationfilter //= require i18n //= require oauth -//= require piwik +//= require matomo //= require richtext //= require qs/dist/qs //= require bs-custom-file-input @@ -33,6 +33,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,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 () { @@ -142,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")); });