mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-25 14:28:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* Replace deprecated String.prototype.substr()

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

* Change String.prototype.substring() to String.prototype.slice()

.substring() and .slice() work very similary but .slice() is a bit faster and stricter

* Add ESLint rule to forbid usage of .substr and .substring

.substr() is deprecated and .substring() is very similar to .slice() so better to use .slice() at all times

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
This commit is contained in:
CommanderRoot 2022-04-04 18:19:45 +02:00 committed by GitHub
parent 80ded02a4b
commit 0ec695e036
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.eslintrc.js
View file

@ -79,6 +79,11 @@ module.exports = {
'no-irregular-whitespace': 'error', 'no-irregular-whitespace': 'error',
'no-mixed-spaces-and-tabs': 'warn', 'no-mixed-spaces-and-tabs': 'warn',
'no-nested-ternary': 'warn', 'no-nested-ternary': 'warn',
'no-restricted-properties': [
'error',
{ property: 'substring', message: 'Use .slice instead of .substring.' },
{ property: 'substr', message: 'Use .slice instead of .substr.' },
],
'no-trailing-spaces': 'warn', 'no-trailing-spaces': 'warn',
'no-undef': 'error', 'no-undef': 'error',
'no-unreachable': 'error', 'no-unreachable': 'error',

2
app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
View file

@ -124,7 +124,7 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo
for (let id in aPool) { for (let id in aPool) {
let emoji = aPool[id], let emoji = aPool[id],
{ search } = emoji, { search } = emoji,
sub = value.substr(0, length), sub = value.slice(0, length),
subIndex = search.indexOf(sub); subIndex = search.indexOf(sub);
if (subIndex !== -1) { if (subIndex !== -1) {

2
app/javascript/mastodon/features/status/components/card.js
View file

@ -32,7 +32,7 @@ const trim = (text, len) => {
return text; return text;
} }
return text.substring(0, cut) + (text.length > len ? '…' : ''); return text.slice(0, cut) + (text.length > len ? '…' : '');
}; };
const domParser = new DOMParser(); const domParser = new DOMParser();

2
app/javascript/mastodon/features/video/index.js
View file

@ -91,7 +91,7 @@ export const fileNameFromURL = str => {
const pathname = url.pathname; const pathname = url.pathname;
const index = pathname.lastIndexOf('/'); const index = pathname.lastIndexOf('/');
return pathname.substring(index + 1); return pathname.slice(index + 1);
}; };
export default @injectIntl export default @injectIntl