diff --git a/addons/addon-fit/src/FitAddon.ts b/addons/addon-fit/src/FitAddon.ts index 3db988acd..75bbe9caa 100644 --- a/addons/addon-fit/src/FitAddon.ts +++ b/addons/addon-fit/src/FitAddon.ts @@ -74,14 +74,14 @@ export class FitAddon implements ITerminalAddon, IFitApi { : (this._terminal.options.scrollbar?.width ?? ViewportConstants.DEFAULT_SCROLL_BAR_WIDTH)); const parentElementStyle = _getComputedStyle(this._terminal.element.parentElement); - const parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')); - const parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width'))); + const parentElementHeight = Math.max(0, parseInt(parentElementStyle.getPropertyValue('height'), 10) || 0); + const parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width'), 10) || 0); const elementStyle = _getComputedStyle(this._terminal.element); const elementPadding = { - top: parseInt(elementStyle.getPropertyValue('padding-top')), - bottom: parseInt(elementStyle.getPropertyValue('padding-bottom')), - right: parseInt(elementStyle.getPropertyValue('padding-right')), - left: parseInt(elementStyle.getPropertyValue('padding-left')) + top: parseInt(elementStyle.getPropertyValue('padding-top'), 10) || 0, + bottom: parseInt(elementStyle.getPropertyValue('padding-bottom'), 10) || 0, + right: parseInt(elementStyle.getPropertyValue('padding-right'), 10) || 0, + left: parseInt(elementStyle.getPropertyValue('padding-left'), 10) || 0 }; const elementPaddingVer = elementPadding.top + elementPadding.bottom; const elementPaddingHor = elementPadding.right + elementPadding.left; diff --git a/addons/addon-image/src/IIPHandler.ts b/addons/addon-image/src/IIPHandler.ts index 5e15c5277..56f5cdf35 100644 --- a/addons/addon-image/src/IIPHandler.ts +++ b/addons/addon-image/src/IIPHandler.ts @@ -222,8 +222,8 @@ export class IIPHandler implements IOscHandler, IResetHandler { private _dim(s: string, total: number, cdim: number): number { if (s === 'auto') return 0; - if (s.endsWith('%')) return parseInt(s.slice(0, -1)) * total / 100; - if (s.endsWith('px')) return parseInt(s.slice(0, -2)); - return parseInt(s) * cdim; + if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100; + if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10); + return parseInt(s, 10) * cdim; } } diff --git a/addons/addon-image/src/kitty/KittyGraphicsTypes.ts b/addons/addon-image/src/kitty/KittyGraphicsTypes.ts index 448ebcc05..4288dd0a4 100644 --- a/addons/addon-image/src/kitty/KittyGraphicsTypes.ts +++ b/addons/addon-image/src/kitty/KittyGraphicsTypes.ts @@ -168,7 +168,7 @@ export function parseKittyCommand(data: string): IKittyCommand { cmd.deleteSelector = value; continue; } - const numValue = parseInt(value); + const numValue = parseInt(value, 10); switch (key) { case KittyKey.FORMAT: cmd.format = numValue; break; case KittyKey.ID: cmd.id = numValue; break; diff --git a/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts b/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts index 357d512d2..137cca7e3 100644 --- a/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts +++ b/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts @@ -221,8 +221,8 @@ function drawPathDefinitionCharacter( const rx = parseFloat(args[0]) * deviceCellWidth; const ry = parseFloat(args[1]) * deviceCellHeight; const xAxisRotation = parseFloat(args[2]) * Math.PI / 180; - const largeArcFlag = parseInt(args[3]); - const sweepFlag = parseInt(args[4]); + const largeArcFlag = parseInt(args[3], 10); + const sweepFlag = parseInt(args[4], 10); const x = xOffset + parseFloat(args[5]) * deviceCellWidth; const y = yOffset + parseFloat(args[6]) * deviceCellHeight; drawSvgArc(ctx, currentX, currentY, rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y); diff --git a/src/browser/input/Mouse.ts b/src/browser/input/Mouse.ts index c40a7cc78..5f73743fb 100644 --- a/src/browser/input/Mouse.ts +++ b/src/browser/input/Mouse.ts @@ -6,8 +6,8 @@ export function getCoordsRelativeToElement(window: Pick, event: {clientX: number, clientY: number}, element: HTMLElement): [number, number] { const rect = element.getBoundingClientRect(); const elementStyle = window.getComputedStyle(element); - const leftPadding = parseInt(elementStyle.getPropertyValue('padding-left')); - const topPadding = parseInt(elementStyle.getPropertyValue('padding-top')); + const leftPadding = parseInt(elementStyle.getPropertyValue('padding-left'), 10); + const topPadding = parseInt(elementStyle.getPropertyValue('padding-top'), 10); return [ event.clientX - rect.left - leftPadding, event.clientY - rect.top - topPadding @@ -22,7 +22,7 @@ export function getCoordsRelativeToElement(window: Pick