Merge branch 'pull/5297'

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 24d50dcce623d204dfb12569d2d3ffb4696ae9c3..ead01a8ff8e0dcfef8e9c2235c2e9198700cd515 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,6 +1,5 @@
 //= require jquery3
 //= require jquery_ujs
 //= require jquery3
 //= require jquery_ujs

-//= require jquery.timers

 //= require jquery.throttle-debounce
 //= require js-cookie/dist/js.cookie
 //= require popper
 //= require jquery.throttle-debounce
 //= require js-cookie/dist/js.cookie
 //= require popper


@@ -16,8 +15,6 @@
 //= require matomo
 //= require richtext
 //= require qs/dist/qs
 //= require matomo
 //= require richtext
 //= require qs/dist/qs

-//= require bs-custom-file-input
-//= require bs-custom-file-input-init

 
 /*
  * Called as the user scrolls/zooms around to manipulate hrefs of the
 
 /*
  * Called as the user scrolls/zooms around to manipulate hrefs of the


@@ -33,6 +30,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;


@@ -67,17 +65,10 @@ window.updateLinks = function (loc, zoom, layers, object) {
     .toggleClass("disabled", editDisabled);
 };
 
     .toggleClass("disabled", editDisabled);
 };
 

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

 $(document).ready(function () {
 $(document).ready(function () {

-  $("#edit_tab")
-    .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));
+  // NB: Turns Turbo Drive off by default. Turbo Drive must be opt-in on a per-link and per-form basis
+  // See https://turbo.hotwired.dev/reference/drive#turbo.session.drive
+  Turbo.session.drive = false;

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


@@ -113,9 +104,13 @@ $(document).ready(function () {
 
     $("body").removeClass("compact-nav");
 
 
     $("body").removeClass("compact-nav");
 

+    $("header").removeClass("text-nowrap");
+    $("header nav.secondary > ul").removeClass("flex-nowrap");
+

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

+    $(document).on("turbo:render", updateHeader);

   }, 0);
 
   $("#menu-icon").on("click", function (e) {
   }, 0);
 
   $("#menu-icon").on("click", function (e) {


@@ -134,6 +129,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;


@@ -146,4 +142,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"));

 });
 });