loadstate
This commit is contained in:
22
src/app.js
22
src/app.js
@@ -1620,8 +1620,16 @@ let driverBrandFilter = "";
|
|||||||
let carBrandFilter = "";
|
let carBrandFilter = "";
|
||||||
let raceFormatAdvanced = false;
|
let raceFormatAdvanced = false;
|
||||||
|
|
||||||
const OBS_LAYOUTS = ["leaderboard", "grid", "lowerthird"];
|
function getObsLayouts() {
|
||||||
const OBS_THEMES = ["panel", "transparent", "chroma"];
|
return ["leaderboard", "grid", "lowerthird"];
|
||||||
|
}
|
||||||
|
|
||||||
|
function getObsThemes() {
|
||||||
|
return ["panel", "transparent", "chroma"];
|
||||||
|
}
|
||||||
|
|
||||||
|
const OBS_LAYOUTS = getObsLayouts();
|
||||||
|
const OBS_THEMES = getObsThemes();
|
||||||
|
|
||||||
function createDefaultObsOverlaySettings() {
|
function createDefaultObsOverlaySettings() {
|
||||||
return {
|
return {
|
||||||
@@ -1645,8 +1653,10 @@ function normalizeObsOverlaySettings(raw = {}) {
|
|||||||
const defaults = createDefaultObsOverlaySettings();
|
const defaults = createDefaultObsOverlaySettings();
|
||||||
const rowValue = Number(raw?.rows);
|
const rowValue = Number(raw?.rows);
|
||||||
const rows = Number.isFinite(rowValue) ? Math.max(3, Math.min(12, Math.round(rowValue))) : defaults.rows;
|
const rows = Number.isFinite(rowValue) ? Math.max(3, Math.min(12, Math.round(rowValue))) : defaults.rows;
|
||||||
const layout = OBS_LAYOUTS.includes(String(raw?.layout || "").toLowerCase()) ? String(raw.layout).toLowerCase() : defaults.layout;
|
const layoutOptions = getObsLayouts();
|
||||||
const theme = OBS_THEMES.includes(String(raw?.theme || "").toLowerCase()) ? String(raw.theme).toLowerCase() : defaults.theme;
|
const themeOptions = getObsThemes();
|
||||||
|
const layout = layoutOptions.includes(String(raw?.layout || "").toLowerCase()) ? String(raw.layout).toLowerCase() : defaults.layout;
|
||||||
|
const theme = themeOptions.includes(String(raw?.theme || "").toLowerCase()) ? String(raw.theme).toLowerCase() : defaults.theme;
|
||||||
return {
|
return {
|
||||||
rows,
|
rows,
|
||||||
showClock: raw?.showClock !== false,
|
showClock: raw?.showClock !== false,
|
||||||
@@ -1682,8 +1692,8 @@ function getObsOverlayConfig() {
|
|||||||
showResult: parseOverlayBooleanParam("showResult", base.showResult),
|
showResult: parseOverlayBooleanParam("showResult", base.showResult),
|
||||||
showBest: parseOverlayBooleanParam("showBest", base.showBest),
|
showBest: parseOverlayBooleanParam("showBest", base.showBest),
|
||||||
showGap: parseOverlayBooleanParam("showGap", base.showGap),
|
showGap: parseOverlayBooleanParam("showGap", base.showGap),
|
||||||
layout: OBS_LAYOUTS.includes(String(urlParams.get("layout") || "").toLowerCase()) ? String(urlParams.get("layout")).toLowerCase() : base.layout,
|
layout: getObsLayouts().includes(String(urlParams.get("layout") || "").toLowerCase()) ? String(urlParams.get("layout")).toLowerCase() : base.layout,
|
||||||
theme: OBS_THEMES.includes(String(urlParams.get("obsTheme") || "").toLowerCase()) ? String(urlParams.get("obsTheme")).toLowerCase() : base.theme,
|
theme: getObsThemes().includes(String(urlParams.get("obsTheme") || "").toLowerCase()) ? String(urlParams.get("obsTheme")).toLowerCase() : base.theme,
|
||||||
publicToken: String(urlParams.get("token") || base.publicToken || "").trim(),
|
publicToken: String(urlParams.get("token") || base.publicToken || "").trim(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user