From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Nov 2022 12:19:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3688'
X-Git-Tag: live~1917
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/152414861caa30e9217e3451caabd5a2b983ce2b?hp=-c

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

152414861caa30e9217e3451caabd5a2b983ce2b
diff --combined app/assets/javascripts/application.js
index 4f53a0493,24d50dcce..5a4127e26
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@@ -33,7 -33,6 +33,7 @@@ window.updateLinks = function (loc, zoo
      delete args.way;
      delete args.relation;
      delete args.changeset;
 +    delete args.note;
  
      if (object && editlink) {
        args[object.type] = object.id;
@@@ -57,13 -56,12 +57,12 @@@
      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" })
-     .attr("data-bs-original-title", editDisabled ?
-       I18n.t("javascripts.site.edit_disabled_tooltip") : "")
-     // Disable the button group and also the buttons to avoid
-     // inconsistent behaviour when zooming
+     .tooltip(editDisabled ? "enable" : "disable")
      .toggleClass("disabled", editDisabled)
      .find("a")
      .toggleClass("disabled", editDisabled);
@@@ -78,6 -76,9 +77,9 @@@ window.minimiseMap = function () 
  };
  
  $(document).ready(function () {
+   $("#edit_tab")
+     .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));
+ 
    var headerWidth = 0,
        compactWidth = 0;