Replace deprecated String.prototype.substr() (#19111)

.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index c4241e8d60..c9a1b15e71 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -3188,7 +3188,7 @@ function PiwikTest() {
         equal(tracker.getVisitorId(), visitorId, "After tracking an action and updating the ID cookie, the visitor ID is still the same.");
 
         // Visitor ID is by default set to a UUID fingerprint
-        var hashUserId = tracker.hook.test._sha1(userIdString).substr(0, 16);
+        var hashUserId = tracker.hook.test._sha1(userIdString).slice(0, 16);
         notEqual(hashUserId, tracker.getVisitorId(), "Visitor ID " + tracker.getVisitorId() + " is not yet the hash of User ID " + hashUserId);
         notEqual("", tracker.getVisitorId(), "Visitor ID is not empty");
         ok( tracker.getVisitorId().length === 16, "Visitor ID is 16 chars string");
@@ -3231,7 +3231,7 @@ function PiwikTest() {
         // Set User ID and verify it was set
         tracker.setUserId(userIdString);
         equal(userIdString, tracker.getUserId(), "getUserId() returns User Id");
-            notEqual(tracker.hook.test._sha1(userIdString).substr(0, 16), tracker.getVisitorId(), "Visitor ID is not the sha1 of User ID (it used to be)");
+            notEqual(tracker.hook.test._sha1(userIdString).slice(0, 16), tracker.getVisitorId(), "Visitor ID is not the sha1 of User ID (it used to be)");
             equal(tracker.getVisitorId(), tracker2.getVisitorId(), "After setting a User ID, Visitor ID does not change");
 
             // Set the User ID and verify nothing's changed
@@ -3657,7 +3657,7 @@ if ($mysql) {
 
         var piwikUrl = location.href;
         if (piwikUrl.indexOf('?') > 0) {
-            piwikUrl = piwikUrl.substr(0, piwikUrl.indexOf('?'));
+            piwikUrl = piwikUrl.slice(0, piwikUrl.indexOf('?'));
         }
         equal(tracker.getPiwikUrl(), piwikUrl, "getPiwikUrl, relative tracker url" );
 
@@ -4968,7 +4968,7 @@ if ($mysql) {
         strictEqual(tracker.hasRememberedConsent(), true, "rememberConsentGiven, sets cookie to remember consent" );
         var rememberedConsent = tracker.getRememberedConsent();
         strictEqual(String(rememberedConsent).length, 13, "getRememberedConsent, returns the data in milliseconds eg '1522200406749'" );
-        strictEqual(String(rememberedConsent).substr(0, 2), '16', "getRememberedConsent, starts with correct data" );
+        strictEqual(String(rememberedConsent).slice(0, 2), '16', "getRememberedConsent, starts with correct data" );
 
         tracker.requireConsent();
         strictEqual(tracker.hasConsent(), true, "when requiring consent, and we remembered consent, consent should be given" );
diff --git a/tests/javascript/jash/Jash.js b/tests/javascript/jash/Jash.js
index 80288a40aa..de05745d48 100644
--- a/tests/javascript/jash/Jash.js
+++ b/tests/javascript/jash/Jash.js
@@ -1116,7 +1116,7 @@ Jash.Indenter = {
 				if (tagLevel === -1) {
 					level--;
 				}
-				arr = this.indentAndAdd(level,source.substr(startedAt,tagLength),arr);
+				arr = this.indentAndAdd(level,source.slice(startedAt,startedAt+tagLength),arr);
 				if (tagLevel === 1) {
 					level++;
 				}
@@ -1129,7 +1129,7 @@ Jash.Indenter = {
 					}
 					if (source.charAt(position) === '<') {
 						tagLength = position-startedAt;
-						arr = this.indentAndAdd(level,source.substr(startedAt,tagLength),arr);
+						arr = this.indentAndAdd(level,source.slice(startedAt,startedAt+tagLength),arr);
 					}
 				} else {
 					position++;
@@ -1455,7 +1455,7 @@ Jash.TabComplete = function() {
 		fragLength++;
 		matches = this.doAllStringsInArrayHaveSameCharacterAtIndex(fragLength,arr);
 	    }
-	    return arr[0].substr(0,fragLength);
+	    return arr[0].slice(0,fragLength);
 	}
 	/**
 	* Attempt to complete an element id or class name based on what is available in all
@@ -1535,7 +1535,7 @@ Jash.TabComplete = function() {
 					/* tokenize classes into array */
 					var classes = els[i].className.split(/\s/);
 					for(var ii = 0; ii < classes.length; ii++) {
-						if(classes[ii].indexOf(lastSelector.substr(1)) == 0 || lastSelector == ".") {
+						if(classes[ii].indexOf(lastSelector.slice(1)) == 0 || lastSelector == ".") {
 							/* prevent duplicate entries */
 							if(matches.join("***").indexOf(classes[ii]) == -1) {
 								matches.push("." + classes[ii]);
@@ -1547,7 +1547,7 @@ Jash.TabComplete = function() {
 		/* id */
 		} else if (lastSelector.match(/^#/)) {
 			for(var i = 0; i<els.length; i++) {
-				if(els[i].id && els[i].id.indexOf(lastSelector.substr(1)) == 0) {
+				if(els[i].id && els[i].id.indexOf(lastSelector.slice(1)) == 0) {
 					matches.push("#" + els[i].id);
 				}
 			}
diff --git a/tests/javascript/jslint/jslint.js b/tests/javascript/jslint/jslint.js
index f6e37b8440..455820a0cb 100644
--- a/tests/javascript/jslint/jslint.js
+++ b/tests/javascript/jslint/jslint.js
@@ -951,7 +951,7 @@ var JSLINT = (function () {
             var c, pos = 0, r = '', result;
 
             function hex(n) {
-                var i = parseInt(source_row.substr(pos + 1, n), 16);
+                var i = parseInt(source_row.slice(pos + 1, pos + 1 + n), 16);
                 pos += n;
                 if (i >= 32 && i <= 126 &&
                         i !== 34 && i !== 92 && i !== 39) {
diff --git a/tests/lib/screenshot-testing/support/chai-extras.js b/tests/lib/screenshot-testing/support/chai-extras.js
index e807412b57..2160673845 100644
--- a/tests/lib/screenshot-testing/support/chai-extras.js
+++ b/tests/lib/screenshot-testing/support/chai-extras.js
@@ -237,7 +237,7 @@ function assumeFileIsImageIfNotSpecified(filename) {
 
 function endsWith(string, needle)
 {
-    return string.substr(-1 * needle.length, needle.length) === needle;
+    return needle.length === 0 || string.slice(-needle.length) === needle;
 }
 
 // other automatically run assertions