diff --git a/src/app.js b/src/app.js index 3a7c378..92599eb 100644 --- a/src/app.js +++ b/src/app.js @@ -1,4 +1,5 @@ import { installListSorting } from "./list_sorting.js"; +import { escapeHtml } from "./html_escape.js"; import { getOverlayModeLabel, buildOverlayPanels, renderOverlaySidePanel, renderOverlayLeaderboard, renderTeamOverlay, renderObsOverlay } from "./overlays.js"; import { renderSettings } from "./settings.js"; @@ -5260,15 +5261,6 @@ function chunkArray(items, size) { return chunks; } -function escapeHtml(value) { - return String(value) - .replaceAll("&", "&") - .replaceAll("<", "<") - .replaceAll(">", ">") - .replaceAll('"', """) - .replaceAll("'", "'"); -} - function isValidIsoDate(value) { return /^\d{4}-\d{2}-\d{2}$/.test(String(value || "")); } diff --git a/src/html_escape.js b/src/html_escape.js new file mode 100644 index 0000000..1e3a5b7 --- /dev/null +++ b/src/html_escape.js @@ -0,0 +1,8 @@ +export function escapeHtml(value) { + return String(value ?? "") + .replaceAll("&", "&") + .replaceAll("<", "<") + .replaceAll(">", ">") + .replaceAll('"', """) + .replaceAll("'", "'"); +} diff --git a/src/list_sorting.js b/src/list_sorting.js index ea032ce..e42f9c0 100644 --- a/src/list_sorting.js +++ b/src/list_sorting.js @@ -1,3 +1,5 @@ +import { escapeHtml } from "./html_escape.js"; + const storageKey = "racecore.listSorting.v1"; const preferences = new Map(); let loaded = false; @@ -17,6 +19,7 @@ export function parseSortValue(value) { const text = String(value ?? "").trim(); if (!text || /^[\sāā-]+$/.test(text)) return null; const normalized = text.replace(/\u2212/g, "-").replace(/,/g, "."); + if (/^0\d/.test(normalized)) return text; // zero-padded identifiers (e.g. car number "09") are names, not quantities - keep as text so "09" and "9" don't collide if (/^[+-]?\d+(?:\.\d+)?\s*(?:%|s|L)?$/.test(normalized)) return parseFloat(normalized); if (/^[+-]?\d+(?::\d+){1,2}(?:\.\d+)?$/.test(normalized)) { const sign = normalized.startsWith("-") ? -1 : 1; @@ -42,7 +45,7 @@ export function compareSortValues(left, right, direction = "asc") { } export function sortValuesAttribute(values) { - return JSON.stringify(values).replaceAll("&", "&").replaceAll('"', """).replaceAll("<", "<").replaceAll(">", ">"); + return escapeHtml(JSON.stringify(values)); } export function sortableTable(markup, id) { diff --git a/src/overlays.js b/src/overlays.js index c0dd6d9..08115b1 100644 --- a/src/overlays.js +++ b/src/overlays.js @@ -1,4 +1,5 @@ import { sortValuesAttribute } from "./list_sorting.js"; +import { escapeHtml as escapeHtmlLocal } from "./html_escape.js"; export function getOverlayModeLabel(mode, { t }) { return t(`overlay.mode_${String(mode || "leaderboard").toLowerCase()}`); } @@ -55,18 +56,22 @@ export function renderOverlaySidePanel(panel, { t, escapeHtml }) { `; } -export function renderOverlayLeaderboard(rows, { t, escapeHtml, formatTeamActiveMemberLabel, formatLap, formatPredictedLapDelta }) { +export function renderOverlayLeaderboard(rows, { t, escapeHtml, formatTeamActiveMemberLabel, formatLap, formatPredictedLapDelta }, { sortable = true } = {}) { if (!rows.length) { return `
${t("timing.no_laps")}
`; } + const sortAttrs = sortable + ? ` data-sort-id="overlay-leaderboard" data-sort-labels="${sortValuesAttribute([t("table.pos"), t("table.driver"), t("table.laps"), t("table.result"), t("table.gap"), t("table.ahead_gap"), t("table.own_delta"), t("table.best_lap")])}"` + : ""; return ` -