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

Clean up zindex

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-23 00:53:04 +01:00
parent dee1f577e8
commit 5ac181fdf2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/static/js/admin/console.js
View File

@@ -688,12 +688,14 @@ export function createAdminConsole({
if (!isAudio && Number.isFinite(targetOrder)) { if (!isAudio && Number.isFinite(targetOrder)) {
if (isScript) { if (isScript) {
const currentOrder = getScriptLayerOrder().filter((id) => id !== assetId); const currentOrder = getScriptLayerOrder().filter((id) => id !== assetId);
const insertIndex = Math.max(0, currentOrder.length - Math.round(targetOrder)); const totalCount = currentOrder.length + 1;
const insertIndex = Math.max(0, Math.min(currentOrder.length, totalCount - Math.round(targetOrder)));
currentOrder.splice(insertIndex, 0, assetId); currentOrder.splice(insertIndex, 0, assetId);
scriptLayerOrder = currentOrder; scriptLayerOrder = currentOrder;
} else { } else {
const currentOrder = getLayerOrder().filter((id) => id !== assetId); const currentOrder = getLayerOrder().filter((id) => id !== assetId);
const insertIndex = Math.max(0, currentOrder.length - Math.round(targetOrder)); const totalCount = currentOrder.length + 1;
const insertIndex = Math.max(0, Math.min(currentOrder.length, totalCount - Math.round(targetOrder)));
currentOrder.splice(insertIndex, 0, assetId); currentOrder.splice(insertIndex, 0, assetId);
layerOrder = currentOrder; layerOrder = currentOrder;
} }

8
src/main/resources/static/js/broadcast/renderer.js
View File

@@ -291,17 +291,19 @@ export class BroadcastRenderer {
this.hideAssetWithTransition(merged); this.hideAssetWithTransition(merged);
return; return;
} }
const targetOrder = Number.isFinite(patch.order) ? patch.order : null; const targetOrder = Number.isFinite(sanitizedPatch.order) ? sanitizedPatch.order : null;
if (Number.isFinite(targetOrder)) { if (Number.isFinite(targetOrder)) {
if (isScript) { if (isScript) {
const currentOrder = getScriptLayerOrder(this.state).filter((id) => id !== assetId); const currentOrder = getScriptLayerOrder(this.state).filter((id) => id !== assetId);
const insertIndex = Math.max(0, currentOrder.length - Math.round(targetOrder)); const totalCount = currentOrder.length + 1;
const insertIndex = Math.max(0, Math.min(currentOrder.length, totalCount - Math.round(targetOrder)));
currentOrder.splice(insertIndex, 0, assetId); currentOrder.splice(insertIndex, 0, assetId);
this.state.scriptLayerOrder = currentOrder; this.state.scriptLayerOrder = currentOrder;
this.applyScriptCanvasOrder(); this.applyScriptCanvasOrder();
} else if (isVisual) { } else if (isVisual) {
const currentOrder = getLayerOrder(this.state).filter((id) => id !== assetId); const currentOrder = getLayerOrder(this.state).filter((id) => id !== assetId);
const insertIndex = Math.max(0, currentOrder.length - Math.round(targetOrder)); const totalCount = currentOrder.length + 1;
const insertIndex = Math.max(0, Math.min(currentOrder.length, totalCount - Math.round(targetOrder)));
currentOrder.splice(insertIndex, 0, assetId); currentOrder.splice(insertIndex, 0, assetId);
this.state.layerOrder = currentOrder; this.state.layerOrder = currentOrder;
} }