X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/447c05fcb8e306b1be53b4108f816ac8d5663324..14936150ac8ab5cb4e8347b772b2c966f2add43f:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d18ece0b1..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,9 +13,9 @@
 //= 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
 
@@ -25,21 +25,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 = {
@@ -57,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 () {
@@ -143,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"));
 });