don't pan map wen closing/reopening/commenting a note, fixes #648

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index dd44ea1078eac4c41a3bcc812d3da3f2590562b0..464bbecee17db7f7ded5ddcf115ff0dc2c13395b 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,144 +1,192 @@
-//= require jquery
+//= require jquery3

 //= require jquery_ujs
 //= 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');
+{
+  const application_data = $("head").data();

 
 

-function zoomPrecision(zoom) {
-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-}
+  I18n.default_locale = OSM.DEFAULT_LOCALE;
+  I18n.locale = application_data.locale;
+  I18n.fallbacks = true;

 
 

-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;
-    });
+  OSM.preferred_editor = application_data.preferredEditor;
+  OSM.preferred_languages = application_data.preferredLanguages;

 
 

-  setTimeout(function () {
-    if (!loaded) {
-      alert(I18n.t('site.index.remote_failed'));
-      iframe.remove();
+  if (application_data.user) {
+    OSM.user = application_data.user;
+
+    if (application_data.userHome) {
+      OSM.home = application_data.userHome;

     }
     }

-  }, 1000);
+  }

 
 

-  return false;
+  if (application_data.location) {
+    OSM.location = application_data.location;
+  }

 }
 
 /*
 }
 
 /*

- * 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) {
-    var href = link.href.split(/[?#]/)[0],
-      args = querystring.parse(link.search.substring(1)),
-      editlink = $(link).hasClass("editlink");
-
-    delete args['node'];
-    delete args['way'];
-    delete args['relation'];
-    delete args['changeset'];
+window.updateLinks = function (loc, zoom, layers, object) {
+  $(".geolink").each(function (index, link) {
+    let href = link.href.split(/[?#]/)[0];
+    const queryArgs = new URLSearchParams(link.search),
+          editlink = $(link).hasClass("editlink");
+
+    for (const arg of ["node", "way", "relation", "changeset", "note"]) {
+      queryArgs.delete(arg);
+    }

 
     if (object && editlink) {
 
     if (object && editlink) {

-      args[object.type] = object.id;
+      queryArgs.set(object.type, object.id);

     }
 
     }
 

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

 
 

-    args = {
+    const hashArgs = {

       lat: loc.lat,
       lat: loc.lat,

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

       zoom: zoom
     };
 
     if (layers && !editlink) {
       zoom: zoom
     };
 
     if (layers && !editlink) {

-      args.layers = layers;
+      hashArgs.layers = layers;

     }
 
     }
 

-    href += OSM.formatHash(args);
+    href += OSM.formatHash(hashArgs);

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

 
 

-// 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('|');
-}
+$(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;
+
+  const $expandedSecondaryMenu = $("header nav.secondary > ul"),
+        $collapsedSecondaryMenu = $("#compact-secondary-nav > ul"),
+        secondaryMenuItems = [],
+        breakpointWidth = 768;
+  let moreItemWidth = 0;
+
+  function updateHeader() {
+    var windowWidth = $(window).width();
+
+    if (windowWidth < breakpointWidth) {
+      $("body").addClass("small-nav");
+      expandAllSecondaryMenuItems();
+    } else {
+      $("body").removeClass("small-nav");
+      const availableWidth = $expandedSecondaryMenu.width();
+      secondaryMenuItems.forEach(function (item) {
+        $(item[0]).remove();
+      });
+      let runningWidth = 0,
+          i = 0,
+          requiredWidth;
+      for (; i < secondaryMenuItems.length; i++) {
+        runningWidth += secondaryMenuItems[i][1];
+        if (i < secondaryMenuItems.length - 1) {
+          requiredWidth = runningWidth + moreItemWidth;
+        } else {
+          requiredWidth = runningWidth;
+        }
+        if (requiredWidth > availableWidth) {
+          break;
+        }
+        expandSecondaryMenuItem($(secondaryMenuItems[i][0]));
+      }
+      for (; i < secondaryMenuItems.length; i++) {
+        collapseSecondaryMenuItem($(secondaryMenuItems[i][0]));
+      }
+    }
+  }

 
 

-function escapeHTML(string) {
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;'
-  };
-  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
-      return htmlEscapes[match];
-  });
-}
+  function expandAllSecondaryMenuItems() {
+    secondaryMenuItems.forEach(function (item) {
+      expandSecondaryMenuItem($(item[0]));
+    });
+  }
+
+  function expandSecondaryMenuItem($item) {
+    $item.children("a")
+      .removeClass("dropdown-item")
+      .addClass("nav-link")
+      .addClass(function () {
+        return $(this).hasClass("active") ? "text-secondary-emphasis" : "text-secondary";
+      });
+    $item.addClass("nav-item").insertBefore("#compact-secondary-nav");
+    toggleCompactSecondaryNav();
+  }
+
+  function collapseSecondaryMenuItem($item) {
+    $item.children("a")
+      .addClass("dropdown-item")
+      .removeClass("nav-link text-secondary text-secondary-emphasis");
+    $item.removeClass("nav-item").appendTo($collapsedSecondaryMenu);
+    toggleCompactSecondaryNav();
+  }
+
+  function toggleCompactSecondaryNav() {
+    $("#compact-secondary-nav").toggle(
+      $collapsedSecondaryMenu.find("li").length > 0
+    );
+  }
+
+  /*
+   * 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 () {
+    $expandedSecondaryMenu.find("li:not(#compact-secondary-nav)").each(function () {
+      secondaryMenuItems.push([this, $(this).width()]);
+    });
+    moreItemWidth = $("#compact-secondary-nav").width();

 
 

-function maximiseMap() {
-  $("#content").addClass("maximised");
-}
+    updateHeader();

 
 

-function minimiseMap() {
-  $("#content").removeClass("maximised");
-}
+    $(window).resize(updateHeader);
+    $(document).on("turbo:render", updateHeader);
+  }, 0);

 
 

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

-});

 
 

-if (Math.random() * 100 < 5) {
-  L.OSM.Mapnik.prototype.options.url = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
-}
+  $("#edit_tab")
+    .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));
+});