Enable a few linting rules

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 29563cb4a0020fa520d56ddcd1c0f0f05a78b0d8..2e13f69671bec7253adbe5c98887a33c105d7725 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require oauth
 //= require matomo
 //= require richtext
 //= require oauth
 //= require matomo
 //= require richtext

-//= require qs/dist/qs

 
 {
   const application_data = $("head").data();
 
 {
   const application_data = $("head").data();


@@ -45,34 +44,32 @@
  */
 window.updateLinks = function (loc, zoom, layers, object) {
   $(".geolink").each(function (index, link) {
  */
 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");
+    let href = link.href.split(/[?#]/)[0];
+    const queryArgs = new URLSearchParams(link.search),
+          editlink = $(link).hasClass("editlink");

 
 

-    delete args.node;
-    delete args.way;
-    delete args.relation;
-    delete args.changeset;
-    delete args.note;
+    for (const arg of ["node", "way", "relation", "changeset", "note"]) {
+      queryArgs.delete(arg);
+    }

 
     if (object && editlink) {
 
     if (object && editlink) {

-      args[object.type] = object.id;
+      queryArgs.set(object.type, object.id);

     }
 
     }
 

-    var query = Qs.stringify(args);
+    const query = queryArgs.toString();

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

-    args = {
+    const hashArgs = {

       lat: loc.lat,
       lon: "lon" in loc ? loc.lon : loc.lng,
       zoom: zoom
     };
 
     if (layers && !editlink) {
       lat: loc.lat,
       lon: "lon" in loc ? loc.lon : loc.lng,
       zoom: zoom
     };
 
     if (layers && !editlink) {

-      args.layers = layers;
+      hashArgs.layers = layers;

     }
 
     }
 

-    href += OSM.formatHash(args);
+    href += OSM.formatHash(hashArgs);

 
     link.href = href;
   });
 
     link.href = href;
   });


@@ -116,13 +113,13 @@ $(document).ready(function () {
    */
   setTimeout(function () {
     $("header").children(":visible").each(function (i, e) {
    */
   setTimeout(function () {
     $("header").children(":visible").each(function (i, e) {

-      headerWidth = headerWidth + $(e).outerWidth();
+      headerWidth += $(e).outerWidth();

     });
 
     $("body").addClass("compact-nav");
 
     $("header").children(":visible").each(function (i, e) {
     });
 
     $("body").addClass("compact-nav");
 
     $("header").children(":visible").each(function (i, e) {

-      compactWidth = compactWidth + $(e).outerWidth();
+      compactWidth += $(e).outerWidth();

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