X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8d2271699bfe8199ebeac2d2bf491e2133cc02d8..191d7f371031cec6a1b83157d3e9f17dee787075:/app/assets/javascripts/application.js?ds=sidebyside diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d861cbb33..8e6bf0790 100644 --- 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 jquery.cookie //= require jquery.throttle-debounce +//= require js-cookie/src/js.cookie //= require popper //= require bootstrap-sprockets //= require osm -//= require leaflet +//= require leaflet/dist/leaflet-src //= require leaflet.osm //= require leaflet.map //= require leaflet.zoom @@ -15,7 +15,7 @@ //= require oauth //= require piwik //= require richtext -//= require querystring +//= require qs/dist/qs //= require bs-custom-file-input //= require bs-custom-file-input-init @@ -25,9 +25,8 @@ */ 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; @@ -39,7 +38,7 @@ window.updateLinks = function (loc, zoom, layers, object) { args[object.type] = object.id; } - var query = querystring.stringify(args); + var query = Qs.stringify(args); if (query) href += "?" + query; args = { @@ -83,11 +82,11 @@ $(document).ready(function () { var windowWidth = $(window).width(); if (windowWidth < compactWidth) { - $("body").removeClass("compact").addClass("small"); + $("body").removeClass("compact-nav").addClass("small-nav"); } else if (windowWidth < headerWidth) { - $("body").addClass("compact").removeClass("small"); + $("body").addClass("compact-nav").removeClass("small-nav"); } else { - $("body").removeClass("compact").removeClass("small"); + $("body").removeClass("compact-nav").removeClass("small-nav"); } } @@ -102,13 +101,13 @@ $(document).ready(function () { headerWidth = headerWidth + $(e).outerWidth(); }); - $("body").addClass("compact"); + $("body").addClass("compact-nav"); $("header").children(":visible").each(function (i, e) { compactWidth = compactWidth + $(e).outerWidth(); }); - $("body").removeClass("compact"); + $("body").removeClass("compact-nav"); updateHeader();