From a46467b9149ef5435124c3cfab5737332293afa5 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 11 Feb 2026 00:01:48 +0000
Subject: [PATCH] =upload manager tweaks; especially for fields that already have values and are being updated
---
assets/js/concise/UploadManager.js | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/assets/js/concise/UploadManager.js b/assets/js/concise/UploadManager.js
index a18ff2d..bdeb9e7 100644
--- a/assets/js/concise/UploadManager.js
+++ b/assets/js/concise/UploadManager.js
@@ -1471,21 +1471,31 @@
if (!confirm('Remove this item?')) return;
if (uploadId) {
- // New upload managed by stores
await this.removeUpload(uploadId);
} else {
- // Existing server-rendered attachment
const fieldId = this.getFieldIdFromElement(button);
item.remove();
+
if (fieldId) {
+ this.updateHiddenInput(fieldId);
this.maybeLockUploads(fieldId);
- this.notify('attachment-removed', { attachmentId, fieldId });
}
}
this.a11y.announce('Item removed');
}
+ updateHiddenInput(fieldId) {
+ const field = this.fields.get(fieldId);
+ if (!field?.ui.hidden) return;
+
+ const remaining = Array.from(field.ui.grid?.querySelectorAll(this.selectors.items.item) || [])
+ .map(el => el.dataset.id || el.dataset.uploadId)
+ .filter(Boolean);
+
+ field.ui.hidden.value = remaining.join(',');
+ field.ui.hidden.dispatchEvent(new Event('change', { bubbles: true }));
+ }
async setBulkUpload(uploads, key, value) {
const promises = Array.from(uploads).map(async (upload) => {
if (typeof upload === 'string') upload = await this.stores.uploads.get(upload);
@@ -1511,6 +1521,8 @@
async removeUpload(uploadId) {
let upload = this.stores.uploads.get(uploadId);
if (!upload) return;
+ const fieldId = upload.field; // grab before clearing
+
if (upload.group) {
let group = this.stores.groups.get(upload.group);
group.uploads = group.uploads.filter(id => id !== uploadId);
@@ -1522,10 +1534,11 @@
}
await this.clearUpload(uploadId);
- this.maybeLockUploads(upload.field);
+ this.updateHiddenInput(fieldId);
+ this.maybeLockUploads(fieldId);
- let handler = this.selectionHandlers.get(upload.field);
- if (handler){
+ let handler = this.selectionHandlers.get(fieldId);
+ if (handler) {
handler.deselect(uploadId);
}
@@ -1958,18 +1971,14 @@
return;
}
- // Get current order from DOM
- let items = Array.from(target.children)
- .filter(el => el.matches(this.selectors.items.item) && !el.classList.contains('ghost'))
- .map(upload => upload.dataset.uploadId)
- .filter(id => id);
-
if (!groupId) {
- let hiddenInput = this.fields.get(fieldId)?.ui.hidden;
- if (hiddenInput) {
- hiddenInput.value = items.join(',');
- }
+ this.updateHiddenInput(fieldId);
} else {
+ let items = Array.from(target.children)
+ .filter(el => el.matches(this.selectors.items.item) && !el.classList.contains('ghost'))
+ .map(upload => upload.dataset.uploadId)
+ .filter(id => id);
+
let group = this.stores.groups.get(groupId);
if (group) {
group.uploads = items;
--
Gitblit v1.10.0