Bootstrap 5: change rounded-sm to rounded-1

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 36b560fde68c4f0132e49a213a3264f76232f5b4..d5b16bbfb293c3019bee839066dfe803b4e87941 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,12 +1,12 @@
 //= 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 js-cookie/dist/js.cookie

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

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

 //= require leaflet.osm
 //= require leaflet.map
 //= require leaflet.zoom
 //= require leaflet.osm
 //= require leaflet.map
 //= require leaflet.zoom


@@ -15,7 +15,9 @@
 //= require oauth
 //= require piwik
 //= require richtext
 //= require oauth
 //= require piwik
 //= require richtext

-//= require querystring
+//= 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


@@ -23,9 +25,8 @@
  */
 window.updateLinks = function (loc, zoom, layers, object) {
   $(".geolink").each(function (index, link) {
  */
 window.updateLinks = function (loc, zoom, layers, object) {
   $(".geolink").each(function (index, link) {

-    var querystring = require("querystring-component"),
-        href = link.href.split(/[?#]/)[0],
-        args = querystring.parse(link.search.substring(1)),
+    var href = link.href.split(/[?#]/)[0],
+        args = Qs.parse(link.search.substring(1)),

         editlink = $(link).hasClass("editlink");
 
     delete args.node;
         editlink = $(link).hasClass("editlink");
 
     delete args.node;


@@ -37,7 +38,7 @@ window.updateLinks = function (loc, zoom, layers, object) {
       args[object.type] = object.id;
     }
 
       args[object.type] = object.id;
     }
 

-    var query = querystring.stringify(args);
+    var query = Qs.stringify(args);

     if (query) href += "?" + query;
 
     args = {
     if (query) href += "?" + query;
 
     args = {


@@ -58,11 +59,13 @@ window.updateLinks = function (loc, zoom, layers, object) {
   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; })
-    .toggleClass("disabled", editDisabled)

     .attr("data-original-title", editDisabled ?
     .attr("data-original-title", editDisabled ?

-      I18n.t("javascripts.site.edit_disabled_tooltip") : "");
+      I18n.t("javascripts.site.edit_disabled_tooltip") : "")
+    // Disable the button group and also the buttons to avoid
+    // inconsistent behaviour when zooming
+    .toggleClass("disabled", editDisabled)
+    .find("a")
+    .toggleClass("disabled", editDisabled);

 };
 
 window.maximiseMap = function () {
 };
 
 window.maximiseMap = function () {