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

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

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

-//= require jquery.cookie

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

-//= require bootstrap.tooltip
-//= require bootstrap.dropdown
+//= require js-cookie/dist/js.cookie
+//= require popper
+//= require bootstrap-sprockets

 //= require osm
 //= require osm

-//= require leaflet
+//= require leaflet/dist/leaflet-src

 //= require leaflet.osm
 //= require leaflet.map
 //= require leaflet.zoom
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth
 //= require leaflet.osm
 //= require leaflet.map
 //= require leaflet.zoom
 //= require leaflet.locationfilter
 //= require i18n
 //= require oauth

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

 //= require richtext
 //= require richtext

-//= require querystring
-
-var querystring = require('querystring-component');
+//= require qs/dist/qs
+//= require bs-custom-file-input
+//= require bs-custom-file-input-init

 
 /*
 
 /*

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

  * view tab and various other links
  */
 window.updateLinks = function (loc, zoom, layers, object) {
  * view tab and various other links
  */
 window.updateLinks = function (loc, zoom, layers, object) {

-  $(".geolink").each(function(index, link) {
+  $(".geolink").each(function (index, link) {

     var href = link.href.split(/[?#]/)[0],
     var href = link.href.split(/[?#]/)[0],

-      args = querystring.parse(link.search.substring(1)),
-      editlink = $(link).hasClass("editlink");
+        args = Qs.parse(link.search.substring(1)),
+        editlink = $(link).hasClass("editlink");

 
     delete args.node;
     delete args.way;
     delete args.relation;
     delete args.changeset;
 
     delete args.node;
     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;
     }
 

-    var query = querystring.stringify(args);
-    if (query) href += '?' + query;
+    var query = Qs.stringify(args);
+    if (query) href += "?" + query;

 
     args = {
       lat: loc.lat,
 
     args = {
       lat: loc.lat,

-      lon: 'lon' in loc ? loc.lon : loc.lng,
+      lon: "lon" in loc ? loc.lon : loc.lng,

       zoom: zoom
     };
 
       zoom: zoom
     };
 


@@ -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;
   var editDisabled = zoom < 13;

-  $('#edit_tab')
-    .tooltip({placement: 'bottom'})
-    .off('click.minzoom')
-    .on('click.minzoom', function() { return !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");
+  $("#edit_tab")
+    .tooltip({ placement: "bottom" })
+    .tooltip(editDisabled ? "enable" : "disable")
+    .toggleClass("disabled", editDisabled)
+    .find("a")
+    .toggleClass("disabled", editDisabled);

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


@@ -82,11 +76,11 @@ $(document).ready(function () {
     var windowWidth = $(window).width();
 
     if (windowWidth < compactWidth) {
     var windowWidth = $(window).width();
 
     if (windowWidth < compactWidth) {

-      $("body").removeClass("compact").addClass("small");
+      $("body").removeClass("compact-nav").addClass("small-nav");

     } else if (windowWidth < headerWidth) {
     } else if (windowWidth < headerWidth) {

-      $("body").addClass("compact").removeClass("small");
+      $("body").addClass("compact-nav").removeClass("small-nav");

     } else {
     } else {

-      $("body").removeClass("compact").removeClass("small");
+      $("body").removeClass("compact-nav").removeClass("small-nav");

     }
   }
 
     }
   }
 


@@ -97,29 +91,31 @@ $(document).ready(function () {
    * to defer the measurement slightly as a workaround.
    */
   setTimeout(function () {
    * to defer the measurement slightly as a workaround.
    */
   setTimeout(function () {

-    $("header").children(":visible").each(function (i,e) {
+    $("header").children(":visible").each(function (i, e) {

       headerWidth = headerWidth + $(e).outerWidth();
     });
 
       headerWidth = headerWidth + $(e).outerWidth();
     });
 

-    $("body").addClass("compact");
+    $("body").addClass("compact-nav");

 
 

-    $("header").children(":visible").each(function (i,e) {
+    $("header").children(":visible").each(function (i, e) {

       compactWidth = compactWidth + $(e).outerWidth();
     });
 
       compactWidth = compactWidth + $(e).outerWidth();
     });
 

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

 
     updateHeader();
 
     $(window).resize(updateHeader);
   }, 0);
 
 
     updateHeader();
 
     $(window).resize(updateHeader);
   }, 0);
 

-  $("#menu-icon").on("click", function(e) {
+  $("#menu-icon").on("click", function (e) {

     e.preventDefault();
     $("header").toggleClass("closed");
   });
 
     e.preventDefault();
     $("header").toggleClass("closed");
   });
 

-  $("nav.primary li a").on("click", function() {
+  $("nav.primary li a").on("click", function () {

     $("header").toggleClass("closed");
   });
 
     $("header").toggleClass("closed");
   });
 


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

 });
 });