From a24a06002081ad71a78ffeff9072725ba39cf121 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 17 Feb 2026 20:05:31 +0000
Subject: [PATCH] =minor changes, particularly around the JVB_CHILD_URL pattern
---
assets/js/concise/PopulateForm.js | 186 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 158 insertions(+), 28 deletions(-)
diff --git a/assets/js/concise/PopulateForm.js b/assets/js/concise/PopulateForm.js
index 373a61c..b7e7c02 100644
--- a/assets/js/concise/PopulateForm.js
+++ b/assets/js/concise/PopulateForm.js
@@ -20,6 +20,7 @@
populate (form, data = {})
{
this.data = data;
+ this.mergeRootData();
this.form = form;
if (!this.formHelper) {
this.formHelper = window.jvbForm;
@@ -42,6 +43,13 @@
}
}
+ mergeRootData(){
+ let check = ['status','date','modified'];
+ check.forEach(ch =>{
+ this.data.fields[`post_${ch}`] = this.data[ch];
+ });
+ }
+
/**
*
* @param {HTMLElement} field
@@ -56,20 +64,25 @@
const handlers = {
'repeater': this.populateRepeater.bind(this),
'tag-list': this.populateTagList.bind(this),
+ 'group': this.populateGroup.bind(this),
'location': this.populateLocation.bind(this),
'selector': this.populateTaxonomy.bind(this),
'user': this.populateUser.bind(this),
'upload': this.populateUpload.bind(this),
+ 'gallery': this.populateUpload.bind(this),
+ 'image': this.populateUpload.bind(this),
'set': this.populateMultiValue.bind(this),
'checkbox': this.populateMultiValue.bind(this),
'select': this.populateSingleValue.bind(this),
'radio': this.populateSingleValue.bind(this),
'true-false': this.populateBoolean.bind(this),
+ 'toggle-text': this.populateBoolean.bind(this),
'date': this.populateDate.bind(this),
'time': this.populateDate.bind(this),
'datetime': this.populateDate.bind(this),
'number': this.populateNumber.bind(this),
- 'textarea': this.populateTextarea.bind(this)
+ 'textarea': this.populateTextarea.bind(this),
+ 'quantity': this.populateNumber.bind(this),
};
if (Object.hasOwn(handlers, type)) {
@@ -83,36 +96,91 @@
if (!value || !Array.isArray(value)) return;
const container = field.querySelector('.repeater-items');
- let template = field.querySelector('template')?.className??false;
+ let template = field.querySelector('template')?.className ?? false;
if (!container || !template) return;
window.removeChildren(container);
value.forEach((data, index) => {
- data.index = index;
- const row = this.templates.create(template, data);
- let fields = row.querySelectorAll('.field');
- this.populate(fields, data);
+ const templateData = { ...data, index, repeater: field };
+
+ const row = this.templates.create(template, templateData);
+ if (!row) return;
+
container.append(row);
+
+ const formConfig = this.formHelper.getForm(row);
+ if (formConfig) {
+ this.formHelper.initializeFields(row, formConfig);
+ }
+
+ for (let [fieldName, fieldValue] of Object.entries(data)) {
+ let subField = row.querySelector(`[data-field="${fieldName}"]`);
+ if (subField) {
+ this.populateField(subField, fieldName, fieldValue);
+ }
+ }
});
}
populateTagList(field, name, value) {
if (!value || !Array.isArray(value)) return;
const container = field.querySelector('.tag-items');
- let template = field.querySelector('template')?.className??false;
+ let template = field.querySelector('template')?.className ?? false;
if (!container || !template) return;
window.removeChildren(container);
value.forEach((data, index) => {
- data.index = index;
- const row = this.templates.create(template, data);
- let fields = row.querySelectorAll('.field');
- this.populate(fields, data);
+ const row = this.templates.create(template, {
+ label: this.getTagLabel(data, field.dataset.tagFormat ?? 'first_field'),
+ fieldName: name,
+ ...data
+ });
+ if (!row) return;
+
+ // Set hidden input values directly
+ row.querySelectorAll('input[type="hidden"]').forEach(input => {
+ const key = input.dataset.field;
+ if (key && data[key] !== undefined) {
+ input.value = data[key];
+ }
+ });
+
container.append(row);
});
}
+ /**
+ * Build tag label from data - mirrors addTagListItem logic
+ */
+ getTagLabel(data, format) {
+ const values = Object.values(data).filter(v => !this.isEmptyValue(v));
+ switch (format) {
+ case 'first_field':
+ return values[0] ?? 'New Item';
+ case 'all_fields':
+ return values.join(', ') || 'New Item';
+ default:
+ if (format.includes('{')) {
+ let label = format;
+ for (const [key, value] of Object.entries(data)) {
+ label = label.replace(`{${key}}`, value);
+ }
+ return label;
+ }
+ return data[format] ?? values[0] ?? 'New Item';
+ }
+ }
+ populateGroup(field, name, value) {
+ if (!value || typeof value !== 'object') return;
+
+ for (let [subName, subValue] of Object.entries(value)) {
+ let subField = field.querySelector(`[data-field="${subName}"]`);
+ if (subField) {
+ this.populateField(subField, subName, subValue);
+ }
+ }
+ }
populateLocation(field, name, value) {
const subFields = ['address', 'lat', 'lng', 'street', 'city', 'province', 'postal_code', 'country'];
subFields.forEach(subField => {
@@ -137,7 +205,7 @@
}
}
populateUser(field, name, value) {
- this.populateTaxonomyField(field, name, value);
+ this.populateTaxonomy(field, name, value);
}
populateUpload(field, name, value) {
if (name === 'timeline' || field.dataset.subtype && field.dataset.subtype === 'timeline') {
@@ -154,23 +222,55 @@
}
const grid = field.querySelector('.item-grid');
- let uploadContainer = field.querySelector('.file-upload-container');
+ let uploadContainer = field.querySelector('.file-upload-wrapper');
uploadContainer.hidden = ids.length > 0;
field.querySelector('.progress')?.remove();
if (grid) {
window.removeChildren(grid);
ids.forEach(id => {
let data = this.data.images[id]??{};
+ data.field = {
+ config: {
+ showMeta: true
+ }
+ };
data.id = id;
grid.append(this.templates.create('uploadItem', data));
});
}
+
+ this.populateUploadMeta(field, name, value);
}
+ populateUploadMeta(element, name, id) {
+ // Find the image_data field group
+ const imageDataField = element.querySelector('[data-field="image_data"]');
+ if (!imageDataField) return;
+ let data = this.data.images[id]??false;
+ if (!data) return;
+
+ // Set upload ID or attachment ID
+ imageDataField.dataset.attachmentId = data.id;
+ imageDataField.setAttribute('data-ignore', '');
+
+ // Populate the metadata fields
+ const meta = [
+ 'image-title',
+ 'image-alt-text',
+ 'image-caption'
+ ];
+
+ for (const m of meta) {
+ const input = imageDataField.querySelector(`[data-field="${m}"] input, [data-field="${m}"] textarea`);
+ if (input && data[m]!=='') {
+ input.value = window.decodeHTMLEntities(data[m]);
+ }
+ }
+ }
populateTimelineGallery(field,name, value) {
if (!value || !Array.isArray(value) || value.length === 0) return;
let grid = field.querySelector('.item-grid');
- let uploadContainer = field.querySelector('.file-upload-container');
+ let uploadContainer = field.querySelector('.file-upload-wrapper');
uploadContainer.hidden = value.length > 0;
if (grid) {
window.removeChildren(grid);
@@ -202,7 +302,7 @@
}
return;
}
- field.querySelectorAll(`[type="checkbox"][name=${name}]`).forEach(checkbox => {
+ field.querySelectorAll(`input[type="checkbox"][name="${name}[]"], input[type="checkbox"][name="${name}"]`).forEach(checkbox => {
checkbox.checked = value.includes(checkbox.value);
});
@@ -262,18 +362,24 @@
}
}
populateTextarea(field, name, value) {
- let textarea = field.querySelector('textarea');
- if (!textarea.dataset.editor) {
- this.populateText(field, name, value)
- return;
+ let textarea = field.querySelector('textarea[data-editor], textarea');
+ this.populateText(field, name, value);
+
+ if (textarea?.dataset.editor) {
+ const editor = field.querySelector('.ql-editor');
+ if (editor) {
+ editor.innerHTML = value;
+ } else {
+ textarea.dispatchEvent(new Event('change', { bubbles: true }));
+ }
}
- textarea.value = String(value || '');
- textarea.dispatchEvent(new Event('change', {bubbles: true}));
}
populateText(field, name, value) {
- let input = field.querySelector(`[name="${name}"], input, textarea`);
- if (input && input.type !== 'file') {
- input.value = String(value || '');
+ let input = field.querySelector(`[name="${name}"]`)
+ || field.querySelector('textarea[data-editor]')
+ || field.querySelector('input:not([type="hidden"]):not([type="file"]), textarea, select');
+ if (input) {
+ input.value = window.decodeHTMLEntities(value??'');
}
}
/********************************************************************
@@ -306,6 +412,10 @@
video: 'video',
file: '.select-item span',
img: 'img',
+ details: 'details[data-field]',
+ imgAlt: '[name="image-alt-text"]',
+ imgTitle: '[name="image-title"]',
+ imgDesc: '[name="image-caption"]',
},
manyRefs: {
fields: '.field',
@@ -314,7 +424,8 @@
el.dataset.itemId = data.id;
if (refs.select) {
- window.prefixInput(refs.select, `${data.id}-`);
+ let wrapper = refs.select.closest('.preview');
+ window.prefixInput(refs.select, `${data.id}-`, wrapper);
}
if (refs.video) refs.video.remove();
if (refs.file) refs.file.remove();
@@ -326,18 +437,37 @@
refs.img.alt = imgData['image-alt-text']??'';
}
+ if (refs.details) {
+ let imgData = p.data.images[data.post_thumbnail];
+
+ refs.details.setAttribute('data-ignore', '');
+ refs.details.dataset.attachmentId = data.post_thumbnail;
+ if (Object.hasOwn(imgData, 'image-alt-text') && refs.alt) {
+ refs.alt.value = imgData['image-alt-text'];
+ }
+ if ((Object.hasOwn(imgData, 'image-title') || Object.hasOwn(data, 'file')) && refs.title) {
+ refs.title.value = imgData['image-title']||data.file.name;
+ }
+ if (Object.hasOwn(imgData, 'image-caption') && refs.description) {
+ refs.description.value = imgData['image-caption'];
+ }
+ }
+
if (manyRefs.fields) {
for (let field of manyRefs.fields) {
if (field.dataset.fieldType === 'group') continue;
-
+ if (field.dataset.field === 'post_thumbnail') {
+ field.remove();
+ continue;
+ }
let name = field.dataset.field;
let value = data[name]??'';
if (!p.isEmptyValue(value)) {
p.populateField(field, name, value);
}
- const input = field.querySelector('input:not([type="file"]), textarea');
+ const input = field.querySelector('input:not([type="file"])');
if (!input) continue;
- window.prefixInput(input, `[${data.id}]`);
+ window.prefixInput(input, `[${data.id}]`, field);
}
}
--
Gitblit v1.10.0