imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 11:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix localization of duration

Browse Source
This commit is contained in:
Andreas Krühlmann
2025-12-10 16:52:38 +01:00
parent 7685cc6cec
commit 4ac812780a
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/resources/static/js/admin.js
View File

@@ -112,10 +112,17 @@ function formatDurationLabel(durationMs) {
const seconds = totalSeconds % 60; const seconds = totalSeconds % 60;
const minutes = Math.floor(totalSeconds / 60) % 60; const minutes = Math.floor(totalSeconds / 60) % 60;
const hours = Math.floor(totalSeconds / 3600); const hours = Math.floor(totalSeconds / 3600);
const parts = [];
if (hours > 0) { if (hours > 0) {
return `${hours}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`; parts.push(`${hours}h`);
} }
return `${minutes}:${seconds.toString().padStart(2, '0')}`; if (minutes > 0 || hours > 0) {
parts.push(`${minutes}m`);
}
if (seconds > 0 || parts.length === 0) {
parts.push(`${seconds}s`);
}
return parts.join(' ');
} }
function recordDuration(assetId, seconds) { function recordDuration(assetId, seconds) {
@@ -328,7 +335,7 @@ function handleEvent(event) {
applyPatch(assetId, event.patch); applyPatch(assetId, event.patch);
} else if (event.payload) { } else if (event.payload) {
storeAsset(event.payload); storeAsset(event.payload);
if (!event.payload.hidden) { if (!event.payload.hidden && !isVideoAsset(event.payload)) {
ensureMedia(event.payload); ensureMedia(event.payload);
if (isAudioAsset(event.payload) && !loopPlaybackState.has(event.payload.id)) { if (isAudioAsset(event.payload) && !loopPlaybackState.has(event.payload.id)) {
loopPlaybackState.set(event.payload.id, true); loopPlaybackState.set(event.payload.id, true);
@@ -848,6 +855,10 @@ function ensureMedia(asset) {
return null; return null;
} }
if (isVideoAsset(asset)) {
return null;
}
if (isGifAsset(asset) && 'ImageDecoder' in window) { if (isGifAsset(asset) && 'ImageDecoder' in window) {
const animated = ensureAnimatedImage(asset); const animated = ensureAnimatedImage(asset);
if (animated) { if (animated) {
@@ -1046,7 +1057,7 @@ function renderAssetList() {
badges.appendChild(createBadge(getDisplayMediaType(asset))); badges.appendChild(createBadge(getDisplayMediaType(asset)));
if (!isAudioAsset(asset)) { if (!isAudioAsset(asset)) {
badges.appendChild(createBadge(asset.hidden ? 'Hidden' : 'Visible', asset.hidden ? 'danger' : '')); badges.appendChild(createBadge(asset.hidden ? 'Hidden' : 'Visible', asset.hidden ? 'danger' : ''));
badges.appendChild(createBadge(`Z ${asset.zIndex ?? 1}`)); badges.appendChild(createBadge(`Layer ${asset.zIndex ?? 1}`));
} }
const aspectLabel = !isAudioAsset(asset) ? formatAspectRatioLabel(asset) : ''; const aspectLabel = !isAudioAsset(asset) ? formatAspectRatioLabel(asset) : '';
if (aspectLabel) { if (aspectLabel) {

2
src/main/resources/templates/admin.html
View File

@@ -85,7 +85,7 @@
</div> </div>
<div class="control-grid condensed"> <div class="control-grid condensed">
<label> <label>
Layer (Z) Layer
<div class="badge-row stacked"> <div class="badge-row stacked">
<span class="badge">Layer <strong id="asset-z-level">1</strong></span> <span class="badge">Layer <strong id="asset-z-level">1</strong></span>
</div> </div>