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

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cbb69119ced49a9406a6958508303092765bd6f8..0bfff869ebcc87186c1aec12c4a0ff75949a923f 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,8 +1,8 @@
 //= require jquery3
 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery3
 //= require jquery_ujs
 //= require jquery.timers

-//= require jquery.cookie/jquery.cookie

 //= require jquery.throttle-debounce
 //= require jquery.throttle-debounce

+//= require js-cookie/dist/js.cookie

 //= require popper
 //= require bootstrap-sprockets
 //= require osm
 //= require popper
 //= require bootstrap-sprockets
 //= require osm


@@ -13,7 +13,7 @@
 //= 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 bs-custom-file-input
 //= 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.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,22 +57,15 @@ 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 () {


@@ -109,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);


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


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

 });
 });