fix(csp): wire display sliders and accent picker without inline on*
Lint & Test / test (push) Successful in 10s
Lint & Test / test (push) Successful in 10s
The display brightness/contrast sliders and the accent color picker rendered dynamic HTML with inline oninput/onchange/onclick attributes, which are blocked by the script-src 'self' CSP — so display settings were silently un-clickable from the WebUI. Replace the inline attributes with data-* markers, then attach proper event listeners after innerHTML (delegated on the container for the slider rows, direct for the accent dropdown).
This commit is contained in:
@@ -207,20 +207,39 @@ export function renderAccentSwatches() {
|
||||
const swatches = accentPresets.map(p =>
|
||||
`<div class="accent-swatch ${p.color === current ? 'active' : ''}"
|
||||
style="background: ${p.color}"
|
||||
onclick="selectAccentColor('${p.color}', '${p.hover}')"
|
||||
data-accent-color="${p.color}" data-accent-hover="${p.hover}"
|
||||
title="${p.name}"></div>`
|
||||
).join('');
|
||||
|
||||
const customRow = `
|
||||
<div class="accent-custom-row ${isCustom ? 'active' : ''}" onclick="document.getElementById('accentCustomInput').click()">
|
||||
<div class="accent-custom-row ${isCustom ? 'active' : ''}" data-accent-custom-row>
|
||||
<span class="accent-custom-swatch" style="background: ${isCustom ? current : '#888'}"></span>
|
||||
<span class="accent-custom-label">${t('accent.custom')}</span>
|
||||
<input type="color" id="accentCustomInput" value="${current}"
|
||||
onclick="event.stopPropagation()"
|
||||
onchange="selectAccentColor(this.value, lightenColor(this.value, 15))">
|
||||
<input type="color" id="accentCustomInput" value="${current}">
|
||||
</div>`;
|
||||
|
||||
dropdown.innerHTML = swatches + customRow;
|
||||
|
||||
// Wire CSP-safe handlers (script-src 'self' blocks inline on* attributes).
|
||||
dropdown.querySelectorAll('.accent-swatch[data-accent-color]').forEach(el => {
|
||||
el.addEventListener('click', () => {
|
||||
selectAccentColor(el.dataset.accentColor, el.dataset.accentHover);
|
||||
});
|
||||
});
|
||||
const customRowEl = dropdown.querySelector('[data-accent-custom-row]');
|
||||
const customInput = dropdown.querySelector('#accentCustomInput');
|
||||
if (customRowEl && customInput) {
|
||||
customRowEl.addEventListener('click', (e) => {
|
||||
// The native color popup only opens from a user-initiated click on
|
||||
// the <input>. Forward clicks on the row to the input — except when
|
||||
// the input itself was the source (avoids re-entry).
|
||||
if (e.target !== customInput) customInput.click();
|
||||
});
|
||||
customInput.addEventListener('click', (e) => e.stopPropagation());
|
||||
customInput.addEventListener('change', () => {
|
||||
selectAccentColor(customInput.value, lightenColor(customInput.value, 15));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export function selectAccentColor(color, hover) {
|
||||
|
||||
Reference in New Issue
Block a user