From: Tom Hughes <tom@compton.nu>
Date: Tue, 22 Feb 2022 19:06:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3462'
X-Git-Tag: live~2324
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fe7996586927f46f048625fe38ccebc43415d5dd?hp=398a39dd0ae687eddac914490a4616bed4f42f69

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

diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index d3b1ad4b2..c92be4515 100644
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -12,7 +12,7 @@ window.onload = function () {
     I18n.locale = navigator.language;
   }
 
-  var query = (window.location.search || '?').substr(1),
+  var query = (window.location.search || '?').slice(1),
       args  = {};
 
   var pairs = query.split('&');
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index b64bccd64..4b58e6f93 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -103,8 +103,8 @@ OSM.Query = function (map) {
         value = tags[key];
 
         if (prefixes[key]) {
-          var first = value.substr(0, 1).toUpperCase(),
-              rest = value.substr(1).replace(/_/g, " ");
+          var first = value.slice(0, 1).toUpperCase(),
+              rest = value.slice(1).replace(/_/g, " ");
 
           return first + rest;
         }
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 529ac3bea..3e2e7c866 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -146,7 +146,7 @@ OSM = {
       return args;
     }
 
-    hash = Qs.parse(hash.substr(i + 1));
+    hash = Qs.parse(hash.slice(i + 1));
 
     var map = (hash.map || '').split('/'),
       zoom = parseInt(map[0], 10),