Merge pull request #1558 from plarus/master

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b7acc3310d3588508faa1237aa5004ca098578a7..cbb69119ced49a9406a6958508303092765bd6f8 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.cookie/jquery.cookie

 //= require jquery.throttle-debounce
 //= require jquery.throttle-debounce

-//= require bootstrap.tooltip
-//= require bootstrap.dropdown
+//= 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.osm
 //= require leaflet.map
 //= require leaflet.zoom


@@ -15,19 +15,19 @@
 //= require oauth
 //= require piwik
 //= require richtext
 //= require oauth
 //= require piwik
 //= 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)),
-      editlink = $(link).hasClass("editlink");
+        args = Qs.parse(link.search.substring(1)),
+        editlink = $(link).hasClass("editlink");

 
     delete args.node;
     delete args.way;
 
     delete args.node;
     delete args.way;


@@ -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 = {


@@ -82,11 +82,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 +101,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();