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

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7c2e4665eadf634766d1b548a93486d0a79485ea..e455f297be32868f6a5ae73921b4f416c5c5f3ef 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -3,8 +3,8 @@
 //= require jquery.timers
 //= require jquery.cookie
 //= require jquery.throttle-debounce
 //= require jquery.timers
 //= require jquery.cookie
 //= require jquery.throttle-debounce

-//= require bootstrap.tooltip
-//= require bootstrap.dropdown
+//= require popper
+//= require bootstrap-sprockets

 //= require osm
 //= require leaflet
 //= require leaflet.osm
 //= require osm
 //= require leaflet
 //= require leaflet.osm


@@ -17,16 +17,15 @@
 //= require richtext
 //= require querystring
 
 //= require richtext
 //= require querystring
 

-var qs = require("querystring-component");
-

 /*
 /*

- * 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) {
  * 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)),
+    var querystring = require("querystring-component"),
+        href = link.href.split(/[?#]/)[0],
+        args = querystring.parse(link.search.substring(1)),

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


@@ -38,7 +37,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 = querystring.stringify(args);

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