Skip to content

Replace deprecated String.prototype.substr() with String.prototype.slice() #18796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 18, 2022
Merged

Replace deprecated String.prototype.substr() with String.prototype.slice() #18796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743462d
Replace deprecated String.prototype.substr() with String.prototype.sl…
CommanderRoot Feb 17, 2022
5ae33ac
Merge branch 'main' into rm-deprecated-js-substr
lunny Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web_src/js/features/common-global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export function initGlobalLinkActions() {
};
for (const [key, value] of Object.entries(dataArray)) {
if (key && key.startsWith('data')) {
postData[key.substr(4)] = value;
postData[key.slice(4)] = value;
}
if (key === 'id') {
postData['id'] = value;
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/common-issue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function initCommonIssue() {
const issueIDs = $('.issue-checkbox').children('input:checked').map((_, el) => {
return el.getAttribute('data-issue-id');
}).get().join(',');
if (elementId === '0' && url.substr(-9) === '/assignee') {
if (elementId === '0' && url.slice(-9) === '/assignee') {
elementId = '';
action = 'clear';
}
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/comp/ImagePaste.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function initCompImagePaste($target) {
for (const textarea of this.querySelectorAll('textarea')) {
textarea.addEventListener('paste', async (e) => {
for (const img of clipboardPastedImages(e)) {
const name = img.name.substr(0, img.name.lastIndexOf('.'));
const name = img.name.slice(0, img.name.lastIndexOf('.'));
insertAtCursor(textarea, `![${name}]()`);
const data = await uploadFile(img, uploadUrl);
replaceAndKeepCursor(textarea, `![${name}]()`, `![${name}](/attachments/${data.uuid})`);
Expand All @@ -81,7 +81,7 @@ export function initEasyMDEImagePaste(easyMDE, dropzone, files) {
const uploadUrl = dropzone.getAttribute('data-upload-url');
easyMDE.codemirror.on('paste', async (_, e) => {
for (const img of clipboardPastedImages(e)) {
const name = img.name.substr(0, img.name.lastIndexOf('.'));
const name = img.name.slice(0, img.name.lastIndexOf('.'));
const data = await uploadFile(img, uploadUrl);
const pos = easyMDE.codemirror.getCursor();
easyMDE.codemirror.replaceRange(`![${name}](/attachments/${data.uuid})`, pos);
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/repo-code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ function selectRange($list, $select, $from) {
};

if ($from) {
let a = parseInt($select.attr('rel').substr(1));
let b = parseInt($from.attr('rel').substr(1));
let a = parseInt($select.attr('rel').slice(1));
let b = parseInt($from.attr('rel').slice(1));
let c;
if (a !== b) {
if (a > b) {
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/repo-issue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ export function initRepoPullRequestReview() {
// get the name of the parent id
const groupID = commentDiv.closest('div[id^="code-comments-"]').attr('id');
if (groupID && groupID.startsWith('code-comments-')) {
const id = groupID.substr(14);
const id = groupID.slice(14);
$(`#show-outdated-${id}`).addClass('hide');
$(`#code-comments-${id}`).removeClass('hide');
$(`#code-preview-${id}`).removeClass('hide');
Expand Down Expand Up @@ -560,7 +560,7 @@ export function initRepoIssueWipToggle() {
const updateUrl = toggleWip.getAttribute('data-update-url');
await $.post(updateUrl, {
_csrf: csrfToken,
title: title?.startsWith(wipPrefix) ? title.substr(wipPrefix.length).trim() : `${wipPrefix.trim()} ${title}`,
title: title?.startsWith(wipPrefix) ? title.slice(wipPrefix.length).trim() : `${wipPrefix.trim()} ${title}`,
});
window.location.reload();
});
Expand Down
6 changes: 3 additions & 3 deletions web_src/js/features/repo-projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ export default function initRepoProject() {
}

function setLabelColor(label, color) {
const red = getRelativeColor(parseInt(color.substr(1, 2), 16));
const green = getRelativeColor(parseInt(color.substr(3, 2), 16));
const blue = getRelativeColor(parseInt(color.substr(5, 2), 16));
const red = getRelativeColor(parseInt(color.slice(1, 3), 16));
const green = getRelativeColor(parseInt(color.slice(3, 5), 16));
const blue = getRelativeColor(parseInt(color.slice(5, 7), 16));
const luminance = 0.2126 * red + 0.7152 * green + 0.0722 * blue;

if (luminance > 0.179) {
Expand Down