Stick search input and Go button together with flex instead of input group

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7c2e4665eadf634766d1b548a93486d0a79485ea..89f60847fb9261f2432051e5c2441b32b96744e9 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,32 +1,32 @@
 //= 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 qs = 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) {
   $(".geolink").each(function (index, link) {
     var href = link.href.split(/[?#]/)[0],
  * view tab and various other links
  */
 window.updateLinks = function (loc, zoom, layers, object) {
   $(".geolink").each(function (index, link) {
     var href = link.href.split(/[?#]/)[0],

-        args = qs.parse(link.search.substring(1)),
+        args = Qs.parse(link.search.substring(1)),

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


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

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

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


@@ -59,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; })
+    .attr("data-bs-original-title", editDisabled ?
+      I18n.t("javascripts.site.edit_disabled_tooltip") : "")
+    // Disable the button group and also the buttons to avoid
+    // inconsistent behaviour when zooming

     .toggleClass("disabled", editDisabled)
     .toggleClass("disabled", editDisabled)

-    .attr("data-original-title", editDisabled ?
-      I18n.t("javascripts.site.edit_disabled_tooltip") : "");
+    .find("a")
+    .toggleClass("disabled", editDisabled);

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


@@ -82,11 +84,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");

     }
   }
 
     }
   }
 


@@ -101,13 +103,13 @@ $(document).ready(function () {
       headerWidth = headerWidth + $(e).outerWidth();
     });
 
       headerWidth = headerWidth + $(e).outerWidth();
     });
 

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

 
     $("header").children(":visible").each(function (i, e) {
       compactWidth = compactWidth + $(e).outerWidth();
     });
 
 
     $("header").children(":visible").each(function (i, e) {
       compactWidth = compactWidth + $(e).outerWidth();
     });
 

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

 
     updateHeader();
 
 
     updateHeader();