eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: replace deprecated String.prototype.substr()

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

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
This commit is contained in:
Tobias Speicher
2022-03-25 20:41:06 +01:00
parent bb2367ab4a
commit 28dcd38a53
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts
+1 -1
View File
@@ -238,7 +238,7 @@ export class WebglCharAtlas implements IDisposable {
const bg = this._config.colors.background.css; const bg = this._config.colors.background.css;
if (bg.length === 9) { if (bg.length === 9) {
// Remove bg alpha channel if present // Remove bg alpha channel if present
return bg.substr(0, 7); return bg.slice(0, 7);
} }
return bg; return bg;
} }
addons/xterm-addon-webgl/test/WebglRenderer.api.ts
+15 -15
View File
@@ -260,9 +260,9 @@ describe('WebGL Renderer Integration Tests', async () => {
for (let y = 0; y < 240 / 16; y++) { for (let y = 0; y < 240 / 16; y++) {
for (let x = 0; x < 16; x++) { for (let x = 0; x < 16; x++) {
const cssColor = COLORS_16_TO_255[y * 16 + x]; const cssColor = COLORS_16_TO_255[y * 16 + x];
const r = parseInt(cssColor.substr(1, 2), 16); const r = parseInt(cssColor.slice(1, 3), 16);
const g = parseInt(cssColor.substr(3, 2), 16); const g = parseInt(cssColor.slice(3, 5), 16);
const b = parseInt(cssColor.substr(5, 2), 16); const b = parseInt(cssColor.slice(5, 7), 16);
await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]); await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]);
} }
} }
@@ -280,9 +280,9 @@ describe('WebGL Renderer Integration Tests', async () => {
for (let y = 0; y < 240 / 16; y++) { for (let y = 0; y < 240 / 16; y++) {
for (let x = 0; x < 16; x++) { for (let x = 0; x < 16; x++) {
const cssColor = COLORS_16_TO_255[y * 16 + x]; const cssColor = COLORS_16_TO_255[y * 16 + x];
const r = parseInt(cssColor.substr(1, 2), 16); const r = parseInt(cssColor.slice(1, 3), 16);
const g = parseInt(cssColor.substr(3, 2), 16); const g = parseInt(cssColor.slice(3, 5), 16);
const b = parseInt(cssColor.substr(5, 2), 16); const b = parseInt(cssColor.slice(5, 7), 16);
await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]); await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]);
} }
} }
@@ -300,9 +300,9 @@ describe('WebGL Renderer Integration Tests', async () => {
for (let y = 0; y < 240 / 16; y++) { for (let y = 0; y < 240 / 16; y++) {
for (let x = 0; x < 16; x++) { for (let x = 0; x < 16; x++) {
const cssColor = COLORS_16_TO_255[y * 16 + x]; const cssColor = COLORS_16_TO_255[y * 16 + x];
const r = parseInt(cssColor.substr(1, 2), 16); const r = parseInt(cssColor.slice(1, 3), 16);
const g = parseInt(cssColor.substr(3, 2), 16); const g = parseInt(cssColor.slice(3, 5), 16);
const b = parseInt(cssColor.substr(5, 2), 16); const b = parseInt(cssColor.slice(5, 7), 16);
await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]); await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]);
} }
} }
@@ -320,9 +320,9 @@ describe('WebGL Renderer Integration Tests', async () => {
for (let y = 0; y < 240 / 16; y++) { for (let y = 0; y < 240 / 16; y++) {
for (let x = 0; x < 16; x++) { for (let x = 0; x < 16; x++) {
const cssColor = COLORS_16_TO_255[y * 16 + x]; const cssColor = COLORS_16_TO_255[y * 16 + x];
const r = parseInt(cssColor.substr(1, 2), 16); const r = parseInt(cssColor.slice(1, 3), 16);
const g = parseInt(cssColor.substr(3, 2), 16); const g = parseInt(cssColor.slice(3, 5), 16);
const b = parseInt(cssColor.substr(5, 2), 16); const b = parseInt(cssColor.slice(5, 7), 16);
await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]); await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]);
} }
} }
@@ -356,9 +356,9 @@ describe('WebGL Renderer Integration Tests', async () => {
for (let y = 0; y < 240 / 16; y++) { for (let y = 0; y < 240 / 16; y++) {
for (let x = 0; x < 16; x++) { for (let x = 0; x < 16; x++) {
const cssColor = COLORS_16_TO_255[y * 16 + x]; const cssColor = COLORS_16_TO_255[y * 16 + x];
const r = parseInt(cssColor.substr(1, 2), 16); const r = parseInt(cssColor.slice(1, 3), 16);
const g = parseInt(cssColor.substr(3, 2), 16); const g = parseInt(cssColor.slice(3, 5), 16);
const b = parseInt(cssColor.substr(5, 2), 16); const b = parseInt(cssColor.slice(5, 7), 16);
await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]); await pollFor(page, () => getCellColor(x + 1, y + 1), [r, g, b, 255]);
} }
} }
bin/publish.js
+3 -3
View File
@@ -104,11 +104,11 @@ function getNextBetaVersion(packageJson) {
return `${nextStableVersion}-${tag}.1`; return `${nextStableVersion}-${tag}.1`;
} }
const latestPublishedVersion = publishedVersions.sort((a, b) => { const latestPublishedVersion = publishedVersions.sort((a, b) => {
const aVersion = parseInt(a.substr(a.search(/\d+$/))); const aVersion = parseInt(a.slice(a.search(/\d+$/)));
const bVersion = parseInt(b.substr(b.search(/\d+$/))); const bVersion = parseInt(b.slice(b.search(/\d+$/)));
return aVersion > bVersion ? -1 : 1; return aVersion > bVersion ? -1 : 1;
})[0]; })[0];
const latestTagVersion = parseInt(latestPublishedVersion.substr(latestPublishedVersion.search(/\d+$/)), 10); const latestTagVersion = parseInt(latestPublishedVersion.slice(latestPublishedVersion.search(/\d+$/)), 10);
return `${nextStableVersion}-${tag}.${latestTagVersion + 1}`; return `${nextStableVersion}-${tag}.${latestTagVersion + 1}`;
} }
src/browser/Terminal.test.ts
+2 -2
View File
@@ -1332,8 +1332,8 @@ describe('Terminal', () => {
(!(i % 3)) (!(i % 3))
? input[i] ? input[i]
: (i % 3 === 1) : (i % 3 === 1)
? input.substr(i, 2) ? input.slice(i, i + 2)
: input.substr(i - 1, 2), : input.slice(i - 1, i + 1),
terminal.buffer.lines.get(bufferIndex[0])!.loadCell(bufferIndex[1], new CellData()).getChars()); terminal.buffer.lines.get(bufferIndex[0])!.loadCell(bufferIndex[1], new CellData()).getChars());
} }
}); });
src/browser/renderer/CustomGlyphs.ts
+4 -4
View File
@@ -414,10 +414,10 @@ function drawPatternChar(
let b: number; let b: number;
let a: number; let a: number;
if (fillStyle.startsWith('#')) { if (fillStyle.startsWith('#')) {
r = parseInt(fillStyle.substr(1, 2), 16); r = parseInt(fillStyle.slice(1, 3), 16);
g = parseInt(fillStyle.substr(3, 2), 16); g = parseInt(fillStyle.slice(3, 5), 16);
b = parseInt(fillStyle.substr(5, 2), 16); b = parseInt(fillStyle.slice(5, 7), 16);
a = fillStyle.length > 7 && parseInt(fillStyle.substr(7, 2), 16) || 1; a = fillStyle.length > 7 && parseInt(fillStyle.slice(7, 9), 16) || 1;
} else if (fillStyle.startsWith('rgba')) { } else if (fillStyle.startsWith('rgba')) {
([r, g, b, a] = fillStyle.substring(5, fillStyle.length - 1).split(',').map(e => parseFloat(e))); ([r, g, b, a] = fillStyle.substring(5, fillStyle.length - 1).split(',').map(e => parseFloat(e)));
} else { } else {