BlueGit

projects-timfalken-com microchess

Fix material-bar colours under CSP (no inline styles).

Use skin classes for fills and WAAPI for scaleX; add mobile-web-app-capable meta.

timfa Tim Falken · pushed by timfa

Authored 2026-09-13 · 2 months ago

Hash
ebdc158de3da12670f1fb6406f15ab02370d0f92
Parent
f60be7c7
3 files changed +32 −17
web/assets/app.css +16 −2
@@ -1588,20 +1588,34 @@ dialog .avatar-credits {
1588 1588 margin-top: 5px;
1589 1589 border: 1px solid #879187;
1590 1590 border-radius: 5px;
1591 background: var(--material-right, #202823);
1591 background: #202823;
1592 1592 overflow: hidden;
1593 1593 direction: ltr
1594 1594 }
1595 1595
1596 .material-bar.material-right-white { background: #fffefb }
1597 .material-bar.material-right-black { background: #202823 }
1598 .material-bar.material-right-red { background: #c62828 }
1599 .material-bar.material-right-blue { background: #1565c0 }
1600 .material-bar.material-right-green { background: #2e7d32 }
1601 .material-bar.material-right-yellow { background: #f9a825 }
1602
1596 1603 .material-white {
1597 1604 display: block;
1598 1605 width: 100%;
1599 1606 height: 100%;
1600 background: var(--material-left, #fffefb);
1607 background: #fffefb;
1601 1608 transform: scaleX(.5);
1602 1609 transform-origin: left center
1603 1610 }
1604 1611
1612 .material-white.material-left-white { background: #fffefb }
1613 .material-white.material-left-black { background: #202823 }
1614 .material-white.material-left-red { background: #c62828 }
1615 .material-white.material-left-blue { background: #1565c0 }
1616 .material-white.material-left-green { background: #2e7d32 }
1617 .material-white.material-left-yellow { background: #f9a825 }
1618
1605 1619 .material-bar:focus-visible {
1606 1620 outline: 2px solid #c19042;
1607 1621 outline-offset: 3px
@@ -1588,20 +1588,34 @@ dialog .avatar-credits {
1588 margin-top: 5px;
1588 margin-top: 5px;
1589 border: 1px solid #879187;
1589 border: 1px solid #879187;
1590 border-radius: 5px;
1590 border-radius: 5px;
1591 background: var(--material-right, #202823);
1591 background: #202823;
1592 overflow: hidden;
1592 overflow: hidden;
1593 direction: ltr
1593 direction: ltr
1594}
1594}
1595
1595
1596.material-bar.material-right-white { background: #fffefb }
1597.material-bar.material-right-black { background: #202823 }
1598.material-bar.material-right-red { background: #c62828 }
1599.material-bar.material-right-blue { background: #1565c0 }
1600.material-bar.material-right-green { background: #2e7d32 }
1601.material-bar.material-right-yellow { background: #f9a825 }
1602
1596.material-white {
1603.material-white {
1597 display: block;
1604 display: block;
1598 width: 100%;
1605 width: 100%;
1599 height: 100%;
1606 height: 100%;
1600 background: var(--material-left, #fffefb);
1607 background: #fffefb;
1601 transform: scaleX(.5);
1608 transform: scaleX(.5);
1602 transform-origin: left center
1609 transform-origin: left center
1603}
1610}
1604
1611
1612.material-white.material-left-white { background: #fffefb }
1613.material-white.material-left-black { background: #202823 }
1614.material-white.material-left-red { background: #c62828 }
1615.material-white.material-left-blue { background: #1565c0 }
1616.material-white.material-left-green { background: #2e7d32 }
1617.material-white.material-left-yellow { background: #f9a825 }
1618
1605.material-bar:focus-visible {
1619.material-bar:focus-visible {
1606 outline: 2px solid #c19042;
1620 outline: 2px solid #c19042;
1607 outline-offset: 3px
1621 outline-offset: 3px
web/assets/app.js +15 −14
@@ -251,8 +251,11 @@ function renderGames ()
251 251 for (const el of document.querySelectorAll('#main .material-bar'))
252 252 {
253 253 const fill = $('.material-white', el), share = Number(el.dataset.share), old = materialBefore.get(el.closest('[data-game]').dataset.game);
254 fill.style.transform = `scaleX(${share})`;
255 if (!reduced && old && Math.abs(old.share - share) > .0001) fill.animate([{ transform: `scaleX(${old.share})` }, { transform: `scaleX(${share})` }], { duration: old.target === el.dataset.share ? old.remaining : 650, easing: 'linear' });
254 // Prefer WAAPI over element.style — CSP style-src 'self' blocks inline CSSOM writes.
255 if (!reduced && old && Math.abs(old.share - share) > .0001)
256 fill.animate([{ transform: `scaleX(${old.share})` }, { transform: `scaleX(${share})` }], { duration: old.target === el.dataset.share ? old.remaining : 650, easing: 'linear', fill: 'forwards' });
257 else
258 fill.animate([{ transform: `scaleX(${share})` }], { duration: 0, fill: 'forwards' });
256 259 }
257 260 renderMoveFeedback(now, reduced);
258 261 window.microchessPwa?.highlight();
@@ -281,18 +284,17 @@ function card (g)
281 284 else content = board(g) + `<div class="card-footer"><span class="${g.yourTurn ? 'turn-label' : ''}">${g.check ? 'Check · ' : ''}${g.yourTurn ? 'Your move' : 'Waiting for a move'}</span>${g.yourTurn ? `<button class="text-button" data-game-action="options" aria-label="Game options">${g.drawOffer === 'opponent' ? 'Draw offered · ' : ''}•••</button>` : `<span>Move ${Math.floor(g.state.ply / 2) + 1}</span>`}</div>`;
282 285 return `<article class="game-card ${!g.yourTurn && g.status === 'active' ? 'waiting' : ''}" data-game="${g.id}" aria-label="Game with ${esc(g.opponent)}"><div class="card-header">${avatarMarkup(g.opponent, g.opponentAvatar)}<div class="opponent-info"><strong><button class="opponent-name" data-opponent="${esc(g.opponentId)}">${esc(g.opponent)}</button> <small class="rating" aria-label="${g.opponentRating} Elo">${g.opponentRating}</small></strong>${g.status !== 'pending' ? materialBar(g) : ''}</div>${g.status !== 'pending' ? colorTagMarkup(g) : ''}${g.inactiveDays >= 7 ? '<button class="stop-inactive" data-game-action="stop-confirm" aria-label="Stop inactive game" title="Stop inactive game">×</button>' : ''}</div>${content}</article>`;
283 286 }
284 const MATERIAL_BAR_FILL = {
285 White: '#fffefb',
286 Black: '#202823',
287 Red: '#c62828',
288 Blue: '#1565c0',
289 Green: '#2e7d32',
290 Yellow: '#f9a825'
291 };
287 function materialBarSkinName (name, fallback)
288 {
289 return PIECE_COLOR_ORDER.includes(name) ? name : fallback;
290 }
292 291 function materialBarSkins (g)
293 292 {
294 293 if (customColoursDisabled()) return { left: 'White', right: 'Black' };
295 return { left: g.pieceSkinWhite || 'White', right: g.pieceSkinBlack || 'Black' };
294 return {
295 left: materialBarSkinName(g.pieceSkinWhite, 'White'),
296 right: materialBarSkinName(g.pieceSkinBlack, 'Black')
297 };
296 298 }
297 299 function materialBar (g)
298 300 {
@@ -300,14 +302,13 @@ function materialBar (g)
300 302 for (const p of g.state.board) if (p !== '.') totals[p === p.toUpperCase() ? 'w' : 'b'] += materialValues[p.toLowerCase()];
301 303 const total = totals.w + totals.b, share = total ? totals.w / total : .5;
302 304 const { left, right } = materialBarSkins(g);
303 const leftFill = MATERIAL_BAR_FILL[left] || MATERIAL_BAR_FILL.White;
304 const rightFill = MATERIAL_BAR_FILL[right] || MATERIAL_BAR_FILL.Black;
305 305 const you = g.color === 'w' ? left : right;
306 306 const label = `${left}: ${totals.w} material points. ${right}: ${totals.b} material points. You play ${you}${you === 'White' || you === 'Black' ? '' : ` (${g.color === 'w' ? 'White' : 'Black'})`}.`;
307 307 const ariaSides = left === 'White' && right === 'Black'
308 308 ? 'White on the left and Black on the right'
309 309 : `${left} (White) on the left and ${right} (Black) on the right`;
310 return `<div class="material-bar" data-share="${share}" style="--material-left:${leftFill};--material-right:${rightFill}" role="meter" aria-label="Material balance, ${esc(ariaSides)}" aria-valuemin="0" aria-valuemax="100" aria-valuenow="${Math.round(share * 100)}" aria-valuetext="${esc(label)}" title="${esc(label)} Pawn 1 · Knight/Bishop 3 · Rook 5 · Queen 9. Kings are not counted." tabindex="0"><span class="material-white"></span></div>`;
310 // Classes only — inline style= is blocked by CSP style-src 'self'.
311 return `<div class="material-bar material-right-${right.toLowerCase()}" data-share="${share}" role="meter" aria-label="Material balance, ${esc(ariaSides)}" aria-valuemin="0" aria-valuemax="100" aria-valuenow="${Math.round(share * 100)}" aria-valuetext="${esc(label)}" title="${esc(label)} Pawn 1 · Knight/Bishop 3 · Rook 5 · Queen 9. Kings are not counted." tabindex="0"><span class="material-white material-left-${left.toLowerCase()}"></span></div>`;
311 312 }
312 313 function renderMoveFeedback (now, reduced)
313 314 {
@@ -251,8 +251,11 @@ function renderGames ()
251 for (const el of document.querySelectorAll('#main .material-bar'))
251 for (const el of document.querySelectorAll('#main .material-bar'))
252 {
252 {
253 const fill = $('.material-white', el), share = Number(el.dataset.share), old = materialBefore.get(el.closest('[data-game]').dataset.game);
253 const fill = $('.material-white', el), share = Number(el.dataset.share), old = materialBefore.get(el.closest('[data-game]').dataset.game);
254 fill.style.transform = `scaleX(${share})`;
254 // Prefer WAAPI over element.style — CSP style-src 'self' blocks inline CSSOM writes.
255 if (!reduced && old && Math.abs(old.share - share) > .0001) fill.animate([{ transform: `scaleX(${old.share})` }, { transform: `scaleX(${share})` }], { duration: old.target === el.dataset.share ? old.remaining : 650, easing: 'linear' });
255 if (!reduced && old && Math.abs(old.share - share) > .0001)
256 fill.animate([{ transform: `scaleX(${old.share})` }, { transform: `scaleX(${share})` }], { duration: old.target === el.dataset.share ? old.remaining : 650, easing: 'linear', fill: 'forwards' });
257 else
258 fill.animate([{ transform: `scaleX(${share})` }], { duration: 0, fill: 'forwards' });
256 }
259 }
257 renderMoveFeedback(now, reduced);
260 renderMoveFeedback(now, reduced);
258 window.microchessPwa?.highlight();
261 window.microchessPwa?.highlight();
@@ -281,18 +284,17 @@ function card (g)
281 else content = board(g) + `<div class="card-footer"><span class="${g.yourTurn ? 'turn-label' : ''}">${g.check ? 'Check · ' : ''}${g.yourTurn ? 'Your move' : 'Waiting for a move'}</span>${g.yourTurn ? `<button class="text-button" data-game-action="options" aria-label="Game options">${g.drawOffer === 'opponent' ? 'Draw offered · ' : ''}•••</button>` : `<span>Move ${Math.floor(g.state.ply / 2) + 1}</span>`}</div>`;
284 else content = board(g) + `<div class="card-footer"><span class="${g.yourTurn ? 'turn-label' : ''}">${g.check ? 'Check · ' : ''}${g.yourTurn ? 'Your move' : 'Waiting for a move'}</span>${g.yourTurn ? `<button class="text-button" data-game-action="options" aria-label="Game options">${g.drawOffer === 'opponent' ? 'Draw offered · ' : ''}•••</button>` : `<span>Move ${Math.floor(g.state.ply / 2) + 1}</span>`}</div>`;
282 return `<article class="game-card ${!g.yourTurn && g.status === 'active' ? 'waiting' : ''}" data-game="${g.id}" aria-label="Game with ${esc(g.opponent)}"><div class="card-header">${avatarMarkup(g.opponent, g.opponentAvatar)}<div class="opponent-info"><strong><button class="opponent-name" data-opponent="${esc(g.opponentId)}">${esc(g.opponent)}</button> <small class="rating" aria-label="${g.opponentRating} Elo">${g.opponentRating}</small></strong>${g.status !== 'pending' ? materialBar(g) : ''}</div>${g.status !== 'pending' ? colorTagMarkup(g) : ''}${g.inactiveDays >= 7 ? '<button class="stop-inactive" data-game-action="stop-confirm" aria-label="Stop inactive game" title="Stop inactive game">×</button>' : ''}</div>${content}</article>`;
285 return `<article class="game-card ${!g.yourTurn && g.status === 'active' ? 'waiting' : ''}" data-game="${g.id}" aria-label="Game with ${esc(g.opponent)}"><div class="card-header">${avatarMarkup(g.opponent, g.opponentAvatar)}<div class="opponent-info"><strong><button class="opponent-name" data-opponent="${esc(g.opponentId)}">${esc(g.opponent)}</button> <small class="rating" aria-label="${g.opponentRating} Elo">${g.opponentRating}</small></strong>${g.status !== 'pending' ? materialBar(g) : ''}</div>${g.status !== 'pending' ? colorTagMarkup(g) : ''}${g.inactiveDays >= 7 ? '<button class="stop-inactive" data-game-action="stop-confirm" aria-label="Stop inactive game" title="Stop inactive game">×</button>' : ''}</div>${content}</article>`;
283}
286}
284const MATERIAL_BAR_FILL = {
287function materialBarSkinName (name, fallback)
285 White: '#fffefb',
288{
286 Black: '#202823',
289 return PIECE_COLOR_ORDER.includes(name) ? name : fallback;
287 Red: '#c62828',
290}
288 Blue: '#1565c0',
289 Green: '#2e7d32',
290 Yellow: '#f9a825'
291};
292function materialBarSkins (g)
291function materialBarSkins (g)
293{
292{
294 if (customColoursDisabled()) return { left: 'White', right: 'Black' };
293 if (customColoursDisabled()) return { left: 'White', right: 'Black' };
295 return { left: g.pieceSkinWhite || 'White', right: g.pieceSkinBlack || 'Black' };
294 return {
295 left: materialBarSkinName(g.pieceSkinWhite, 'White'),
296 right: materialBarSkinName(g.pieceSkinBlack, 'Black')
297 };
296}
298}
297function materialBar (g)
299function materialBar (g)
298{
300{
@@ -300,14 +302,13 @@ function materialBar (g)
300 for (const p of g.state.board) if (p !== '.') totals[p === p.toUpperCase() ? 'w' : 'b'] += materialValues[p.toLowerCase()];
302 for (const p of g.state.board) if (p !== '.') totals[p === p.toUpperCase() ? 'w' : 'b'] += materialValues[p.toLowerCase()];
301 const total = totals.w + totals.b, share = total ? totals.w / total : .5;
303 const total = totals.w + totals.b, share = total ? totals.w / total : .5;
302 const { left, right } = materialBarSkins(g);
304 const { left, right } = materialBarSkins(g);
303 const leftFill = MATERIAL_BAR_FILL[left] || MATERIAL_BAR_FILL.White;
304 const rightFill = MATERIAL_BAR_FILL[right] || MATERIAL_BAR_FILL.Black;
305 const you = g.color === 'w' ? left : right;
305 const you = g.color === 'w' ? left : right;
306 const label = `${left}: ${totals.w} material points. ${right}: ${totals.b} material points. You play ${you}${you === 'White' || you === 'Black' ? '' : ` (${g.color === 'w' ? 'White' : 'Black'})`}.`;
306 const label = `${left}: ${totals.w} material points. ${right}: ${totals.b} material points. You play ${you}${you === 'White' || you === 'Black' ? '' : ` (${g.color === 'w' ? 'White' : 'Black'})`}.`;
307 const ariaSides = left === 'White' && right === 'Black'
307 const ariaSides = left === 'White' && right === 'Black'
308 ? 'White on the left and Black on the right'
308 ? 'White on the left and Black on the right'
309 : `${left} (White) on the left and ${right} (Black) on the right`;
309 : `${left} (White) on the left and ${right} (Black) on the right`;
310 return `<div class="material-bar" data-share="${share}" style="--material-left:${leftFill};--material-right:${rightFill}" role="meter" aria-label="Material balance, ${esc(ariaSides)}" aria-valuemin="0" aria-valuemax="100" aria-valuenow="${Math.round(share * 100)}" aria-valuetext="${esc(label)}" title="${esc(label)} Pawn 1 · Knight/Bishop 3 · Rook 5 · Queen 9. Kings are not counted." tabindex="0"><span class="material-white"></span></div>`;
310 // Classes only — inline style= is blocked by CSP style-src 'self'.
311 return `<div class="material-bar material-right-${right.toLowerCase()}" data-share="${share}" role="meter" aria-label="Material balance, ${esc(ariaSides)}" aria-valuemin="0" aria-valuemax="100" aria-valuenow="${Math.round(share * 100)}" aria-valuetext="${esc(label)}" title="${esc(label)} Pawn 1 · Knight/Bishop 3 · Rook 5 · Queen 9. Kings are not counted." tabindex="0"><span class="material-white material-left-${left.toLowerCase()}"></span></div>`;
311}
312}
312function renderMoveFeedback (now, reduced)
313function renderMoveFeedback (now, reduced)
313{
314{
web/index.php +1 −1
@@ -14,7 +14,7 @@ $loginQuery=http_build_query(array_filter(['invite'=>$invite,'game'=>$game]));
14 14 <link rel="icon" href="<?= htmlspecialchars(assetUrl('assets/pieces/nlt.svg')) ?>" type="image/svg+xml">
15 15 <link rel="manifest" href="manifest.webmanifest">
16 16 <link rel="apple-touch-icon" href="<?= htmlspecialchars(assetUrl('assets/app-icon-180.png')) ?>">
17 <meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
17 <meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
18 18 <meta name="asset-version" content="<?= htmlspecialchars(assetVersion()) ?>">
19 19 <link rel="stylesheet" href="<?= htmlspecialchars(assetUrl('assets/app.css')) ?>"><script src="<?= htmlspecialchars(assetUrl('assets/app.js')) ?>" defer></script><script src="<?= htmlspecialchars(assetUrl('assets/pwa.js')) ?>" defer></script>
20 20 </head>
@@ -14,7 +14,7 @@ $loginQuery=http_build_query(array_filter(['invite'=>$invite,'game'=>$game]));
14<link rel="icon" href="<?= htmlspecialchars(assetUrl('assets/pieces/nlt.svg')) ?>" type="image/svg+xml">
14<link rel="icon" href="<?= htmlspecialchars(assetUrl('assets/pieces/nlt.svg')) ?>" type="image/svg+xml">
15<link rel="manifest" href="manifest.webmanifest">
15<link rel="manifest" href="manifest.webmanifest">
16<link rel="apple-touch-icon" href="<?= htmlspecialchars(assetUrl('assets/app-icon-180.png')) ?>">
16<link rel="apple-touch-icon" href="<?= htmlspecialchars(assetUrl('assets/app-icon-180.png')) ?>">
17<meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
17<meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
18<meta name="asset-version" content="<?= htmlspecialchars(assetVersion()) ?>">
18<meta name="asset-version" content="<?= htmlspecialchars(assetVersion()) ?>">
19<link rel="stylesheet" href="<?= htmlspecialchars(assetUrl('assets/app.css')) ?>"><script src="<?= htmlspecialchars(assetUrl('assets/app.js')) ?>" defer></script><script src="<?= htmlspecialchars(assetUrl('assets/pwa.js')) ?>" defer></script>
19<link rel="stylesheet" href="<?= htmlspecialchars(assetUrl('assets/app.css')) ?>"><script src="<?= htmlspecialchars(assetUrl('assets/app.js')) ?>" defer></script><script src="<?= htmlspecialchars(assetUrl('assets/pwa.js')) ?>" defer></script>
20</head>
20</head>