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 8b8beb5b4a5164ca10a2c26652ef5662458b0024..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.note;
 
     if (object && editlink) {
       args[object.type] = object.id;
@@ -56,20 +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;
-  var editTab = $("#edit_tab");
-  editTab
-    // Disable the button group and also the buttons to avoid
-    // inconsistent behaviour when zooming
+  $("#edit_tab")
+    .tooltip({ placement: "bottom" })
+    .tooltip(editDisabled ? "enable" : "disable")
     .toggleClass("disabled", editDisabled)
     .find("a")
     .toggleClass("disabled", editDisabled);
-  var editTooltip = bootstrap.Tooltip.getOrCreateInstance(editTab[0], { placement: "bottom" });
-  if (editDisabled) {
-    editTooltip.enable();
-  } else {
-    editTooltip.disable();
-  }
 };
 
 window.maximiseMap = function () {