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

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4a310f22bb8856778e85481e834f7f9fbe6de1dc..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 bootstrap.tooltip
-//= require bootstrap.dropdown
+//= require popper
+//= require bootstrap-sprockets
 //= require osm
 //= require leaflet
 //= require leaflet.osm
@@ -17,17 +17,16 @@
 //= require richtext
 //= require querystring
 
-var querystring = 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) {
-    var href = link.href.split(/[?#]/)[0],
-      args = querystring.parse(link.search.substring(1)),
-      editlink = $(link).hasClass("editlink");
+    var querystring = require("querystring-component"),
+        href = link.href.split(/[?#]/)[0],
+        args = querystring.parse(link.search.substring(1)),
+        editlink = $(link).hasClass("editlink");
 
     delete args.node;
     delete args.way;