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

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 464bbecee17db7f7ded5ddcf115ff0dc2c13395b..e07830d4ea7c7a010ffe5426732298997c5249aa 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,7 +11,6 @@
 //= require leaflet.zoom
 //= require leaflet.locationfilter
 //= require i18n
 //= require leaflet.zoom
 //= require leaflet.locationfilter
 //= require i18n

-//= require oauth

 //= require matomo
 //= require richtext
 
 //= require matomo
 //= require richtext
 


@@ -76,7 +75,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
 
   // Disable the button group and also the buttons to avoid
   // inconsistent behaviour when zooming
 
   // Disable the button group and also the buttons to avoid
   // inconsistent behaviour when zooming

-  var editDisabled = zoom < 13;
+  const editDisabled = zoom < 13;

   $("#edit_tab")
     .tooltip({ placement: "bottom" })
     .tooltip(editDisabled ? "enable" : "disable")
   $("#edit_tab")
     .tooltip({ placement: "bottom" })
     .tooltip(editDisabled ? "enable" : "disable")


@@ -85,7 +84,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
     .toggleClass("disabled", editDisabled);
 };
 
     .toggleClass("disabled", editDisabled);
 };
 

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

   // 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;
   // 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;


@@ -96,8 +95,11 @@ $(document).ready(function () {
         breakpointWidth = 768;
   let moreItemWidth = 0;
 
         breakpointWidth = 768;
   let moreItemWidth = 0;
 

+  OSM.csrf = {};
+  OSM.csrf[($("meta[name=csrf-param]").attr("content"))] = $("meta[name=csrf-token]").attr("content");
+

   function updateHeader() {
   function updateHeader() {

-    var windowWidth = $(window).width();
+    const windowWidth = $(window).width();

 
     if (windowWidth < breakpointWidth) {
       $("body").addClass("small-nav");
 
     if (windowWidth < breakpointWidth) {
       $("body").addClass("small-nav");