Merge remote-tracking branch 'upstream/pull/3647'

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5028cdd1e2b272b0798d318a04f3a2f0705a11ef..89f60847fb9261f2432051e5c2441b32b96744e9 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,7 +13,7 @@
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth

-//= require piwik
+//= require matomo

 //= require richtext
 //= require qs/dist/qs
 //= require bs-custom-file-input
 //= require richtext
 //= require qs/dist/qs
 //= require bs-custom-file-input


@@ -59,14 +59,14 @@ window.updateLinks = function (loc, zoom, layers, object) {
   var editDisabled = zoom < 13;
   $("#edit_tab")
     .tooltip({ placement: "bottom" })
   var editDisabled = zoom < 13;
   $("#edit_tab")
     .tooltip({ placement: "bottom" })

-    .attr("data-original-title", editDisabled ?
+    .attr("data-bs-original-title", editDisabled ?

       I18n.t("javascripts.site.edit_disabled_tooltip") : "")
       I18n.t("javascripts.site.edit_disabled_tooltip") : "")

-    // Disable the button group and also the buttons to avoid 
+    // Disable the button group and also the buttons to avoid

     // inconsistent behaviour when zooming
     .toggleClass("disabled", editDisabled)
     .find("a")
     // inconsistent behaviour when zooming
     .toggleClass("disabled", editDisabled)
     .find("a")

-    .toggleClass("disabled", editDisabled)
- };
+    .toggleClass("disabled", editDisabled);
+};

 
 window.maximiseMap = function () {
   $("#content").addClass("maximised");
 
 window.maximiseMap = function () {
   $("#content").addClass("maximised");