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

diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index d3b1ad4b28e8bdeccf7bc7d19d848e0294daef78..c92be45155133a245a90699d912d69d5b24fe4c0 100644 (file)
--- 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 b64bccd6464eddd6ee0397f53aa0b67b60575f4e..4b58e6f935b4d513974e0d522de118de707cdb29 100644 (file)
--- 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 529ac3beadc18f2ef823b61404c730be7dbf9d98..3e2e7c866e6998403613a361abcda082f7387093 100644 (file)
--- 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),