X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8e288156d47808a9136fd46eeb03b762e0d59a36..9026b84d844fce847820626b495d6c4fcaa55ea1:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5028cdd1e..0bfff869e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,7 +13,7 @@
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth
-//= require piwik
+//= require matomo
 //= require richtext
 //= require qs/dist/qs
 //= require bs-custom-file-input
@@ -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,24 +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" })
-    .attr("data-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)
- };
-
-window.maximiseMap = function () {
-  $("#content").addClass("maximised");
-};
-
-window.minimiseMap = function () {
-  $("#content").removeClass("maximised");
+    .toggleClass("disabled", editDisabled);
 };
 
 $(document).ready(function () {
@@ -111,6 +103,8 @@ $(document).ready(function () {
 
     $("body").removeClass("compact-nav");
 
+    $("header").removeClass("text-nowrap");
+
     updateHeader();
 
     $(window).resize(updateHeader);
@@ -132,6 +126,7 @@ $(document).ready(function () {
   I18n.fallbacks = true;
 
   OSM.preferred_editor = application_data.preferredEditor;
+  OSM.preferred_languages = application_data.preferredLanguages;
 
   if (application_data.user) {
     OSM.user = application_data.user;
@@ -144,4 +139,7 @@ $(document).ready(function () {
   if (application_data.location) {
     OSM.location = application_data.location;
   }
+
+  $("#edit_tab")
+    .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));
 });