From 3d25ad7de4fdbb3eba2cde2a62422e6be5d79a0a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Aug 2026 22:57:22 +0000
Subject: [PATCH] =It's been a minute. I went through the Routes and associated Managers and ensured they played together well. Reworked the Cache.php, and I think I caught all the references. Moving away from JVBase() root class, to individuall classes that are Instanced. Double checked for the ABSPATH check in every file, and added index.php to every directory that didn't already have it. Also still working on the MenuBlock to work with WooCommerce for now for Northeh
---
assets/js/concise/PopulateForm.js | 348 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 234 insertions(+), 114 deletions(-)
diff --git a/assets/js/concise/PopulateForm.js b/assets/js/concise/PopulateForm.js
index 761a134..3cdbee2 100644
--- a/assets/js/concise/PopulateForm.js
+++ b/assets/js/concise/PopulateForm.js
@@ -38,7 +38,7 @@
for (let [name, value] of Object.entries(this.data.fields)) {
let field = form.querySelector(`[data-field="${name}"]`);
if (field) {
- this.populateField(field, name, value);
+ this.populateField(field, name, value, Object.hasOwn(this.data, 'prefix') ? this.data.prefix : null);
}
}
}
@@ -55,70 +55,105 @@
* @param {HTMLElement} field
* @param {string} name
* @param {mixed} value
+ * @param {string|null} prefix, to prefix the input name/id
*/
- populateField(field, name, value) {
+ populateField(field, name, value, prefix = null) {
let type = this.formHelper.getFieldType(field);
- if (!type || this.isEmptyValue(name) || this.isEmptyValue(value)) return;
+ if (!type || this.isEmptyValue(name)) return;
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)) {
- handlers[type](field, name, value);
+ handlers[type](field, name, value, prefix);
} else {
- this.populateText(field, name, value);
+ this.populateText(field, name, value, prefix);
}
}
- populateRepeater(field, name, value) {
- if (!value || !Array.isArray(value)) return;
-
+ populateRepeater(field, name, value, prefix = null) {
const container = field.querySelector('.repeater-items');
let template = field.querySelector('template')?.className ?? false;
if (!container || !template) return;
+ // Normalize: server/store may return an object with numeric keys instead of an array
+ if (typeof value === 'string') {
+ try { value = JSON.parse(value); } catch(e) { value = []; }
+ }
+ if (value && !Array.isArray(value) && typeof value === 'object') {
+ value = Object.values(value);
+ }
+
+ if (!value || !Array.isArray(value) || value.length === 0) {
+ window.removeChildren(container);
+ return;
+ }
+
window.removeChildren(container);
value.forEach((data, index) => {
- data.index = index;
- const row = this.templates.create(template, data);
+ const templateData = { ...data, index, repeater: field };
+ if (prefix) {
+ templateData.prefix = prefix;
+ }
+ const row = this.templates.create(template, templateData);
if (!row) return;
- for (let [fieldName, fieldValue] of Object.entries(data)) {
- if (fieldName === 'index') continue;
- let subField = row.querySelector(`[data-field="${fieldName}"]`);
- if (subField) {
- this.populateField(subField, fieldName, fieldValue);
- }
+ container.append(row);
+
+ const formConfig = this.formHelper.getForm(row);
+ if (formConfig) {
+ this.formHelper.initializeFields(row, formConfig);
}
- container.append(row);
+ for (let [fieldName, fieldValue] of Object.entries(data)) {
+ let subField = row.querySelector(`[data-field="${fieldName}"]`);
+ if (subField) {
+ this.populateField(subField, fieldName, fieldValue, prefix);
+ }
+ }
});
}
- populateTagList(field, name, value) {
- if (!value || !Array.isArray(value)) return;
+ populateTagList(field, name, value, prefix = null) {
const container = field.querySelector('.tag-items');
let template = field.querySelector('template')?.className ?? false;
if (!container || !template) return;
+ if (typeof value === 'string') {
+ try { value = JSON.parse(value); } catch(e) { value = []; }
+ }
+ if (value && !Array.isArray(value) && typeof value === 'object') {
+ value = Object.values(value);
+ }
+
+ if (!value || !Array.isArray(value) || value.length === 0) {
+ window.removeChildren(container);
+ return;
+ }
+
window.removeChildren(container);
value.forEach((data, index) => {
@@ -133,6 +168,10 @@
row.querySelectorAll('input[type="hidden"]').forEach(input => {
const key = input.dataset.field;
if (key && data[key] !== undefined) {
+ if (prefix) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
+
input.value = data[key];
}
});
@@ -161,22 +200,38 @@
return data[format] ?? values[0] ?? 'New Item';
}
}
-
- populateLocation(field, name, value) {
+ populateGroup(field, name, value, prefix = null) {
+ if (!value || typeof value !== 'object') return;
+ console.log(value, 'Populating Group Value: ')
+ for (let [subName, subValue] of Object.entries(value)) {
+ let subField = field.querySelector(`[data-field="${subName}"]`);
+ if (subField) {
+ this.populateField(subField, subName, subValue, prefix);
+ }
+ }
+ }
+ populateLocation(field, name, value, prefix = null) {
const subFields = ['address', 'lat', 'lng', 'street', 'city', 'province', 'postal_code', 'country'];
subFields.forEach(subField => {
if (Object.hasOwn(value, subField)) {
let input = field.querySelector(`[data-location-field="${subField}"]`);
+
+ if (prefix && input) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
if (input) input.value = String(value[subField]||'');
+
}
});
}
- populateTaxonomy(field, name, value) {
+ populateTaxonomy(field, name, value, prefix = null) {
let termIds = this.splitIDs(value);
- if (termIds.length === 0) return;
const hiddenInput = field.querySelector(`input[type="hidden"][name="${name}"]`);
if (hiddenInput) {
+ if (prefix) {
+ window.prefixInput(hiddenInput, prefix, field,false, true);
+ }
hiddenInput.value = termIds.join(',');
if (window.jvbSelector) {
requestAnimationFrame(() => {
@@ -185,26 +240,27 @@
}
}
}
- populateUser(field, name, value) {
- this.populateTaxonomy(field, name, value);
+ populateUser(field, name, value, prefix = null) {
+ this.populateTaxonomy(field, name, value, prefix);
}
- populateUpload(field, name, value) {
- if (name === 'timeline' || field.dataset.subtype && field.dataset.subtype === 'timeline') {
- this.populateTimelineGallery(field,name,value);
+ populateUpload(field, name, value, prefix = null) {
+ if (field.dataset.subtype && field.dataset.subtype === 'timeline') {
+ this.populateTimelineGallery(field,name,value, prefix);
return;
}
- if (this.isEmptyValue(value)) return;
const ids = this.splitIDs(value);
if (ids.length === 0) return;
const hiddenInput = field.querySelector(`input[type="hidden"]`);
if (hiddenInput) {
+ if (prefix) {
+ window.prefixInput(hiddenInput, prefix, field,false, true);
+ }
hiddenInput.value = ids.join(',');
}
const grid = field.querySelector('.item-grid');
- let uploadContainer = field.querySelector('.file-upload-wrapper');
- uploadContainer.hidden = ids.length > 0;
+
field.querySelector('.progress')?.remove();
if (grid) {
window.removeChildren(grid);
@@ -216,56 +272,67 @@
}
};
data.id = id;
+
grid.append(this.templates.create('uploadItem', data));
+ let items = grid.children;
+
+ let item = Array.from(items).filter(it => { return it.dataset.id === `${id}`});
+ item = item[0]??false;
+ if (item) {
+ this.populateUploadMeta(item, null, id);
+ }
});
}
-
- 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;
+ populateUploadMeta(element, name, id, prefix = null) {
+ // 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', '');
+ // 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'
- ];
+ // 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 = data[m];
+ for (const m of meta) {
+ const input = imageDataField.querySelector(`[data-field="image_data|${m}"] input, [data-field="image_data|${m}"] textarea`);
+ if (input && prefix) {
+ window.prefixInput(input, prefix, element,false, true);
+ }
+ if (input && data[m]!=='') {
+ input.value = window.decodeHTMLEntities(data[m]);
+ }
+ }
+ }
+ populateTimelineGallery(field,name, value, prefix = null) {
+ if (!value || !Array.isArray(value) || value.length === 0) return;
+
+ let grid = field.querySelector('.item-grid');
+
+ if (grid) {
+ window.removeChildren(grid);
+
+ field.querySelector('.progress')?.remove();
+ for (let data of value) {
+ if (prefix) {
+ data.prefix = prefix;
+ }
+ let point = this.templates.create('timelineItem', data);
+ if (point) {
+ grid.append(point);
}
}
}
- 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-wrapper');
- uploadContainer.hidden = value.length > 0;
- if (grid) {
- window.removeChildren(grid);
-
- field.querySelector('.progress')?.remove();
- for (let data of value) {
- let point = this.templates.create('timelineItem', data);
- if (point) {
- grid.append(point);
- }
- }
- }
- }
- populateMultiValue(field, name, value) {
+ }
+ populateMultiValue(field, name, value, prefix = null) {
if (typeof value === 'string') {
try {
value = JSON.parse(value);
@@ -281,36 +348,69 @@
for (let option of select.options) {
option.selected = value.includes(option.value);
}
+
+ if (prefix) {
+ window.prefixInput(select, prefix, field,false, true);
+ }
return;
}
- field.querySelectorAll(`[type="checkbox"][name=${name}]`).forEach(checkbox => {
+ field.querySelectorAll(`input[type="checkbox"][name="${name}[]"], input[type="checkbox"][name="${name}"]`).forEach(checkbox => {
+
+ if (prefix) {
+ window.prefixInput(checkbox, prefix, field,false, true);
+ }
+
checkbox.checked = value.includes(checkbox.value);
});
}
- populateSingleValue(field, name, value) {
+ populateSingleValue(field, name, value, prefix = null) {
value = String(value || '');
- // Try select first
let select = field.querySelector(`select[name="${name}"]`);
if (select) {
+ if (prefix) {
+ window.prefixInput(select, prefix, field,false, true);
+ }
select.value = value;
+
return;
}
- let input = field.querySelector(`[name="${name}"][value="${value}"]`);
+
+ let input = field.querySelector(`input[type="radio"][value="${value}"], input[type="checkbox"][value="${value}"]`)
+ || field.querySelector(`[name="${name}"][value="${value}"]`);
if (input) {
+ if (prefix) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
input.checked = true;
}
- }
- populateBoolean(field, name, value) {
- const input = field.querySelector(`[name="${name}"], input[type="checkbox"]`);
- if (input) {
- input.checked = Boolean(value);
+
+ if (prefix) {
+ field.querySelectorAll(`input[type="radio"],input[type="checkbox"], input[name="${name}"]`).forEach(i => {
+ if (i !== input) {
+ window.prefixInput(input, prefix, field, false, true);
+ }
+ });
}
}
- populateDate(field, name, value) {
+ populateBoolean(field, name, value, prefix = null) {
+ const input = field.querySelector(`[name="${name}"], input[type="checkbox"]`);
+ if (input) {
+ if (prefix) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
+ input.checked = Boolean(value);
+
+ }
+ }
+ populateDate(field, name, value, prefix = null) {
const input = field.querySelector(`[name="${name}"], input`);
if (input) {
+ if (prefix) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
+
if (typeof value === 'object' && Object.hasOwn(value, 'date')) {
value = value.date;
}
@@ -334,37 +434,46 @@
} catch (e) {
input.value = value;
}
+
}
}
- populateNumber(field, name, value) {
+ populateNumber(field, name, value, prefix = null) {
const input = field.querySelector(`[name="${name}"], input[type="number"]`);
if (input) {
+ if (prefix) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
input.value = Number(value) || 0;
+
}
}
- populateTextarea(field, name, value) {
- let textarea = field.querySelector('textarea');
- if (!textarea.dataset.editor) {
- this.populateText(field, name, value)
- return;
+ populateTextarea(field, name, value, prefix = null) {
+ let textarea = field.querySelector('textarea[data-editor], textarea');
+ this.populateText(field, name, value, prefix);
+
+ 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 || '');
+ populateText(field, name, value, prefix = null) {
+ let input = field.querySelector(`[name="${name}"]`)
+ || field.querySelector('textarea[data-editor]')
+ || field.querySelector('input:not([type="hidden"]):not([type="file"]), textarea, select');
+ if (input) {
+ if (prefix) {
+ window.prefixInput(input, prefix, field,false, true);
+ }
+ input.value = window.decodeHTMLEntities(value??'');
}
}
/********************************************************************
UTILITY
********************************************************************/
- getFormHelper() {
- window.requestAnimationFrame(()=> {
- this.formHelper = window.jvbForm;
- });
- }
splitIDs(value) {
return String(value).split(',')
@@ -387,10 +496,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"]',
+ details: '[data-field="image_data"] details',
+ imgAlt: '[data-field="image-alt-text"]',
+ imgTitle: '[data-field="image-title"]',
+ imgDesc: '[data-field="image-caption"]',
},
manyRefs: {
fields: '.field',
@@ -408,41 +517,52 @@
let imgData = p.data.images[data['post_thumbnail']]??false;
if (refs.img && imgData) {
refs.img.src = imgData.medium || imgData.small || imgData.large || '';
- refs.img.title = imgData['image-title']??'';
+ refs.img.title = imgData.large.split("/").pop()??'';
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'];
+
+ let imgAlt = refs.imgAlt.querySelector('input');
+ let imgTitle = refs.imgTitle.querySelector('input');
+ let imgDesc = refs.imgDesc.querySelector('textarea');
+ window.prefixInput(imgAlt, `[${data.post_thumbnail}]`, refs.imgAlt, false, true);
+ window.prefixInput(imgTitle, `[${data.post_thumbnail}]`, refs.imgTitle, false, true);
+ window.prefixInput(imgDesc, `[${data.post_thumbnail}]`, refs.imgDesc, false, true);
+
+ if (Object.hasOwn(imgData, 'image-alt-text') && refs.imgAlt) {
+ imgAlt.value = window.decodeHTMLEntities(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-title') || Object.hasOwn(data, 'file')) && refs.imgTitle) {
+ imgTitle.value = window.decodeHTMLEntities(imgData['image-title']||data.file.name);
}
- if (Object.hasOwn(imgData, 'image-caption') && refs.description) {
- refs.description.value = imgData['image-caption'];
+ if (Object.hasOwn(imgData, 'image-caption') && refs.imgDesc) {
+ imgDesc.value = window.decodeHTMLEntities(imgData['image-caption']);
}
}
if (manyRefs.fields) {
for (let field of manyRefs.fields) {
+ if (field.closest('[data-ignore]')) continue;
if (field.dataset.fieldType === 'group') continue;
if (field.dataset.field === 'post_thumbnail') {
field.remove();
continue;
}
let name = field.dataset.field;
- let value = data[name]??'';
+
+ const input = field.querySelector('input:not([type="file"]), textarea, select');
+ if (input) window.prefixInput(input, `[${data.id}]`, field, false, true);
+
+ let value = data[name] ?? '';
if (!p.isEmptyValue(value)) {
p.populateField(field, name, value);
}
- const input = field.querySelector('input:not([type="file"])');
- if (!input) continue;
- window.prefixInput(input, `[${data.id}]`, field);
}
}
--
Gitblit v1.10.0