X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..dbe84a97bf48789e0f32a185f701840fc68063bd:/app/assets/javascripts/application.js?ds=inline diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 03def573d..5bfe86b86 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -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,22 +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") : ""); -}; - -window.maximiseMap = function () { - $("#content").addClass("maximised"); -}; - -window.minimiseMap = function () { - $("#content").removeClass("maximised"); + .find("a") + .toggleClass("disabled", editDisabled); }; $(document).ready(function () { @@ -142,4 +136,7 @@ $(document).ready(function () { if (application_data.location) { OSM.location = application_data.location; } + + $("#edit_tab") + .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip")); });