mirror of
https://github.com/imgfloat/server.git
synced 2026-02-05 03:39:26 +00:00
Merge branch 'a'
This commit is contained in:
@@ -25,14 +25,7 @@ const heightInput = document.getElementById('asset-height');
|
||||
const aspectLockInput = document.getElementById('maintain-aspect');
|
||||
const speedInput = document.getElementById('asset-speed');
|
||||
const muteInput = document.getElementById('asset-muted');
|
||||
const selectedAssetName = document.getElementById('selected-asset-name');
|
||||
const selectedZLabel = document.getElementById('asset-z-level');
|
||||
const selectedTypeLabel = document.getElementById('asset-type-label');
|
||||
const selectedVisibilityBadge = document.getElementById('selected-asset-visibility');
|
||||
const selectedZBadge = document.getElementById('asset-z-badge');
|
||||
const selectedAspectBadge = document.getElementById('asset-aspect-label');
|
||||
const selectedToggleBtn = document.getElementById('selected-asset-toggle');
|
||||
const selectedDeleteBtn = document.getElementById('selected-asset-delete');
|
||||
const playbackSection = document.getElementById('playback-section');
|
||||
const controlsPlaceholder = document.getElementById('asset-controls-placeholder');
|
||||
const aspectLockState = new Map();
|
||||
@@ -52,21 +45,6 @@ if (heightInput) heightInput.addEventListener('input', () => handleSizeInputChan
|
||||
if (heightInput) heightInput.addEventListener('change', () => commitSizeChange());
|
||||
if (speedInput) speedInput.addEventListener('input', updatePlaybackFromInputs);
|
||||
if (muteInput) muteInput.addEventListener('change', updateMuteFromInput);
|
||||
if (selectedToggleBtn) selectedToggleBtn.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
const asset = getSelectedAsset();
|
||||
if (asset) {
|
||||
updateVisibility(asset, !asset.hidden);
|
||||
}
|
||||
});
|
||||
if (selectedDeleteBtn) selectedDeleteBtn.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
const asset = getSelectedAsset();
|
||||
if (asset) {
|
||||
deleteAsset(asset);
|
||||
}
|
||||
});
|
||||
|
||||
function connect() {
|
||||
const socket = new SockJS('/ws');
|
||||
stompClient = Stomp.over(socket);
|
||||
@@ -773,30 +751,9 @@ function updateSelectedAssetControls(asset = getSelectedAsset()) {
|
||||
|
||||
controlsPanel.classList.remove('hidden');
|
||||
lastSizeInputChanged = null;
|
||||
selectedAssetName.textContent = asset.name || `Asset ${asset.id.slice(0, 6)}`;
|
||||
if (selectedZLabel) {
|
||||
selectedZLabel.textContent = asset.zIndex ?? 1;
|
||||
}
|
||||
if (selectedTypeLabel) {
|
||||
selectedTypeLabel.textContent = getDisplayMediaType(asset);
|
||||
}
|
||||
if (selectedZBadge) {
|
||||
selectedZBadge.textContent = `Z ${asset.zIndex ?? 1}`;
|
||||
}
|
||||
if (selectedAspectBadge) {
|
||||
selectedAspectBadge.textContent = formatAspectRatioLabel(asset) || 'Aspect —';
|
||||
}
|
||||
if (selectedVisibilityBadge) {
|
||||
selectedVisibilityBadge.textContent = asset.hidden ? 'Hidden' : 'Visible';
|
||||
selectedVisibilityBadge.classList.toggle('danger', !!asset.hidden);
|
||||
}
|
||||
if (selectedToggleBtn) {
|
||||
const icon = selectedToggleBtn.querySelector('i');
|
||||
if (icon) {
|
||||
icon.className = `fa-solid ${asset.hidden ? 'fa-eye' : 'fa-eye-slash'}`;
|
||||
}
|
||||
selectedToggleBtn.title = asset.hidden ? 'Show asset' : 'Hide asset';
|
||||
}
|
||||
|
||||
if (widthInput) widthInput.value = Math.round(asset.width);
|
||||
if (heightInput) heightInput.value = Math.round(asset.height);
|
||||
|
||||
@@ -32,26 +32,6 @@
|
||||
<ul id="asset-list" class="asset-list"></ul>
|
||||
<div id="asset-controls-placeholder" class="hidden"></div>
|
||||
<div id="asset-controls" class="panel hidden asset-settings">
|
||||
<div class="panel-header">
|
||||
<h4 id="selected-asset-name">Asset settings</h4>
|
||||
<div class="selected-asset-actions">
|
||||
<button type="button" id="selected-asset-toggle" class="ghost icon-button" title="Toggle visibility">
|
||||
<i class="fa-solid fa-eye" aria-hidden="true"></i>
|
||||
<span class="sr-only">Toggle visibility</span>
|
||||
</button>
|
||||
<button type="button" id="selected-asset-delete" class="ghost danger icon-button" title="Delete asset">
|
||||
<i class="fa-solid fa-trash" aria-hidden="true"></i>
|
||||
<span class="sr-only">Delete asset</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="badge-row stacked">
|
||||
<span class="badge subtle" id="selected-asset-visibility">Visible</span>
|
||||
<span class="badge subtle" id="asset-type-label"></span>
|
||||
<span class="badge subtle" id="asset-z-badge"></span>
|
||||
<span class="badge subtle" id="asset-aspect-label"></span>
|
||||
</div>
|
||||
|
||||
<div class="panel-section">
|
||||
<div class="section-header">
|
||||
<h5>Layout & order</h5>
|
||||
@@ -84,6 +64,8 @@
|
||||
<button type="button" onclick="bringForward()" class="secondary" title="Move forward"><i class="fa-solid fa-arrow-up"></i></button>
|
||||
<button type="button" onclick="bringToFront()" class="secondary" title="Bring to front"><i class="fa-solid fa-angles-up"></i></button>
|
||||
<button type="button" onclick="recenterSelectedAsset()" class="secondary" title="Center on canvas"><i class="fa-solid fa-bullseye"></i></button>
|
||||
<button type="button" onclick="nudgeRotation(-5)" class="secondary" title="Rotate left"><i class="fa-solid fa-rotate-left"></i></button>
|
||||
<button type="button" onclick="nudgeRotation(5)" class="secondary" title="Rotate right"><i class="fa-solid fa-rotate-right"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -103,11 +85,6 @@
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-actions filled compact">
|
||||
<button type="button" onclick="nudgeRotation(-5)" class="secondary" title="Rotate left"><i class="fa-solid fa-rotate-left"></i></button>
|
||||
<button type="button" onclick="nudgeRotation(5)" class="secondary" title="Rotate right"><i class="fa-solid fa-rotate-right"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
Reference in New Issue
Block a user