Remove fallback code for undefined history.pushState()

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 89f60847fb9261f2432051e5c2441b32b96744e9..5a4127e266661ec13dcd5bdf0a1de4dbc7d3f164 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -33,6 +33,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
     delete args.way;
     delete args.relation;
     delete args.changeset;
     delete args.way;
     delete args.relation;
     delete args.changeset;

+    delete args.note;

 
     if (object && editlink) {
       args[object.type] = object.id;
 
     if (object && editlink) {
       args[object.type] = object.id;


@@ -56,13 +57,12 @@ window.updateLinks = function (loc, zoom, layers, object) {
     link.href = href;
   });
 
     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" })
   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);
     .toggleClass("disabled", editDisabled)
     .find("a")
     .toggleClass("disabled", editDisabled);


@@ -77,6 +77,9 @@ window.minimiseMap = function () {
 };
 
 $(document).ready(function () {
 };
 
 $(document).ready(function () {

+  $("#edit_tab")
+    .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));
+

   var headerWidth = 0,
       compactWidth = 0;
 
   var headerWidth = 0,
       compactWidth = 0;