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

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e8662e5cff4d45ffe47f9432cf4b13b939b27fb0..2e13f69671bec7253adbe5c98887a33c105d7725 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -48,11 +48,9 @@ window.updateLinks = function (loc, zoom, layers, object) {
     const queryArgs = new URLSearchParams(link.search),
           editlink = $(link).hasClass("editlink");
 
-    queryArgs.delete("node");
-    queryArgs.delete("way");
-    queryArgs.delete("relation");
-    queryArgs.delete("changeset");
-    queryArgs.delete("note");
+    for (const arg of ["node", "way", "relation", "changeset", "note"]) {
+      queryArgs.delete(arg);
+    }
 
     if (object && editlink) {
       queryArgs.set(object.type, object.id);
@@ -115,13 +113,13 @@ $(document).ready(function () {
    */
   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) {
-      compactWidth = compactWidth + $(e).outerWidth();
+      compactWidth += $(e).outerWidth();
     });
 
     $("body").removeClass("compact-nav");