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

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4f53a0493ceda2ff2e1f812540e636df76d467e5..0bfff869ebcc87186c1aec12c4a0ff75949a923f 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -57,26 +57,17 @@ 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);
 };
 

-window.maximiseMap = function () {
-  $("#content").addClass("maximised");
-};
-
-window.minimiseMap = function () {
-  $("#content").removeClass("maximised");
-};
-

 $(document).ready(function () {
   var headerWidth = 0,
       compactWidth = 0;
 $(document).ready(function () {
   var headerWidth = 0,
       compactWidth = 0;


@@ -112,6 +103,8 @@ $(document).ready(function () {
 
     $("body").removeClass("compact-nav");
 
 
     $("body").removeClass("compact-nav");
 

+    $("header").removeClass("text-nowrap");
+

     updateHeader();
 
     $(window).resize(updateHeader);
     updateHeader();
 
     $(window).resize(updateHeader);


@@ -133,6 +126,7 @@ $(document).ready(function () {
   I18n.fallbacks = true;
 
   OSM.preferred_editor = application_data.preferredEditor;
   I18n.fallbacks = true;
 
   OSM.preferred_editor = application_data.preferredEditor;

+  OSM.preferred_languages = application_data.preferredLanguages;

 
   if (application_data.user) {
     OSM.user = application_data.user;
 
   if (application_data.user) {
     OSM.user = application_data.user;


@@ -145,4 +139,7 @@ $(document).ready(function () {
   if (application_data.location) {
     OSM.location = application_data.location;
   }
   if (application_data.location) {
     OSM.location = application_data.location;
   }

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

 });
 });