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 5b06876497a0b4dde3e8666c7671c23691a59e0c..0bfff869ebcc87186c1aec12c4a0ff75949a923f 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,84 +1,50 @@
-//= require jquery
+//= require jquery3

 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery_ujs
 //= require jquery.timers

-//= require jquery.cookie

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

-//= require bootstrap.tooltip
-//= require bootstrap.dropdown
-//= require augment
+//= 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 leaflet.osm
 //= require leaflet.map
 //= require leaflet.zoom
 //= require leaflet.locationfilter

-//= require i18n/translations
+//= require i18n

 //= require oauth
 //= require oauth

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

 //= require richtext
 //= require richtext

-//= require querystring
-
-var querystring = require('querystring-component');
-
-function zoomPrecision(zoom) {
-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-}
-
-function remoteEditHandler(bbox, object) {
-  var loaded = false,
-      query = {
-          left: bbox.getWest() - 0.0001,
-          top: bbox.getNorth() + 0.0001,
-          right: bbox.getEast() + 0.0001,
-          bottom: bbox.getSouth() - 0.0001
-      };
-
-  if (object) query.select = object.type + object.id;
-
-  var iframe = $('<iframe>')
-    .hide()
-    .appendTo('body')
-    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
-    .on('load', function() {
-      $(this).remove();
-      loaded = true;
-    });
-
-  setTimeout(function () {
-    if (!loaded) {
-      alert(I18n.t('site.index.remote_failed'));
-      iframe.remove();
-    }
-  }, 1000);
-
-  return false;
-}
+//= 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
  */
  * view tab and various other links
  */

-function updateLinks(loc, zoom, layers, object) {
-  $(".geolink").each(function(index, link) {
+window.updateLinks = function (loc, zoom, layers, object) {
+  $(".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: loc.lon || loc.lng,
+      lon: "lon" in loc ? loc.lon : loc.lng,

       zoom: zoom
     };
 
       zoom: zoom
     };
 


@@ -91,54 +57,89 @@ function updateLinks(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') : '');
-}
-
-// generate a cookie-safe string of map state
-function cookieContent(map) {
-  var center = map.getCenter().wrap();
-  return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
-}
-
-function escapeHTML(string) {
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;'
-  };
-  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
-      return htmlEscapes[match];
-  });
-}
+  $("#edit_tab")
+    .tooltip({ placement: "bottom" })
+    .tooltip(editDisabled ? "enable" : "disable")
+    .toggleClass("disabled", editDisabled)
+    .find("a")
+    .toggleClass("disabled", editDisabled);
+};

 
 

-function maximiseMap() {
-  $("#content").addClass("maximised");
-}
+$(document).ready(function () {
+  var headerWidth = 0,
+      compactWidth = 0;
+
+  function updateHeader() {
+    var windowWidth = $(window).width();
+
+    if (windowWidth < compactWidth) {
+      $("body").removeClass("compact-nav").addClass("small-nav");
+    } else if (windowWidth < headerWidth) {
+      $("body").addClass("compact-nav").removeClass("small-nav");
+    } else {
+      $("body").removeClass("compact-nav").removeClass("small-nav");
+    }
+  }
+
+  /*
+   * Chrome 60 and later seem to fire the "ready" callback
+   * before the DOM is fully ready causing us to measure the
+   * wrong sizes for the header elements - use a 0ms timeout
+   * to defer the measurement slightly as a workaround.
+   */
+  setTimeout(function () {
+    $("header").children(":visible").each(function (i, e) {
+      headerWidth = headerWidth + $(e).outerWidth();
+    });

 
 

-function minimiseMap() {
-  $("#content").removeClass("maximised");
-}
+    $("body").addClass("compact-nav");

 
 

-$(document).ready(function () {
-  $("#menu-icon").on("click", function(e) {
+    $("header").children(":visible").each(function (i, e) {
+      compactWidth = compactWidth + $(e).outerWidth();
+    });
+
+    $("body").removeClass("compact-nav");
+
+    $("header").removeClass("text-nowrap");
+
+    updateHeader();
+
+    $(window).resize(updateHeader);
+  }, 0);
+
+  $("#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");
   });

-});

 
 

-if (Math.random() * 100 < 20) {
-  L.OSM.Mapnik.prototype.options.url = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
-}
+  var application_data = $("head").data();
+
+  I18n.default_locale = OSM.DEFAULT_LOCALE;
+  I18n.locale = application_data.locale;
+  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.userHome) {
+      OSM.home = application_data.userHome;
+    }
+  }
+
+  if (application_data.location) {
+    OSM.location = application_data.location;
+  }
+
+  $("#edit_tab")
+    .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));
+});