Merge pull request #4610 from AntonKhorev/no-old-note-api

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 03def573d448f29a5aaede16bba22f110e4b54d5..05474212645361fd975d3a0e188edbe1c4bdae81 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,11 +13,9 @@
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth

-//= require piwik
+//= require matomo

 //= require richtext
 //= require qs/dist/qs
 //= 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 +31,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;


@@ -56,25 +55,22 @@ 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" })

-    .off("click.minzoom")
-    .on("click.minzoom", function () { return !editDisabled; })
+    .tooltip(editDisabled ? "enable" : "disable")

     .toggleClass("disabled", editDisabled)
     .toggleClass("disabled", editDisabled)

-    .attr("data-original-title", editDisabled ?
-      I18n.t("javascripts.site.edit_disabled_tooltip") : "");
-};
-
-window.maximiseMap = function () {
-  $("#content").addClass("maximised");
-};
-
-window.minimiseMap = function () {
-  $("#content").removeClass("maximised");
+    .find("a")
+    .toggleClass("disabled", editDisabled);

 };
 
 $(document).ready(function () {
 };
 
 $(document).ready(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;
+

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


@@ -109,9 +105,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) {


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


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

 });
 });