Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.1] Fix JavaScript error caused by using "switcher" layout for radio buttons in subforms #43804

Merged
merged 8 commits into from
Aug 10, 2024
Merged

[5.1] Fix JavaScript error caused by using "switcher" layout for radio buttons in subforms #43804

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8bdda48
Add radio class to container.
mattelkins-bluefrontier Jul 18, 2024
b8bfa93
Revert "Add radio class to container."
mattelkins-bluefrontier Jul 18, 2024
8de36a5
Look for .switcher if .radio is falsy.
mattelkins-bluefrontier Jul 18, 2024
8924b6c
Fix comment line length with Airbnb multiline.
mattelkins-bluefrontier Jul 18, 2024
c2802cf
Look for closest fieldset element should a container with one of the …
mattelkins-bluefrontier Jul 18, 2024
aee1027
Merge branch '5.1-dev' into subform-radio-switcher-js-fix
QuyTon Jul 26, 2024
f0950bc
Merge branch '5.1-dev' into subform-radio-switcher-js-fix
QuyTon Jul 29, 2024
5a77c16
Merge branch '5.1-dev' into subform-radio-switcher-js-fix
bembelimen Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,12 @@ class JoomlaFieldSubform extends HTMLElement {
// Set the id for fieldset and group label
if (!countMulti) {
// Look for <fieldset class="checkboxes"></fieldset> or <fieldset><div class="checkboxes"></div></fieldset>
let fieldset = $el.closest('.checkboxes');
let fieldset = $el.closest('.checkboxes, fieldset');
// eslint-disable-next-line no-nested-ternary
fieldset = fieldset.nodeName === 'FIELDSET' ? fieldset : (fieldset.parentElement.nodeName === 'FIELDSET' ? fieldset.parentElement : false);
if (fieldset) {
// eslint-disable-next-line no-nested-ternary
fieldset = fieldset.nodeName === 'FIELDSET' ? fieldset : (fieldset.parentElement.nodeName === 'FIELDSET' ? fieldset.parentElement : false);
}

if (fieldset) {
const oldSetId = fieldset.id;
Expand All @@ -313,10 +316,17 @@ class JoomlaFieldSubform extends HTMLElement {

// Set the id for fieldset and group label
if (!countMulti) {
// Look for <fieldset class="radio"></fieldset> or <fieldset><div class="radio"></div></fieldset>
let fieldset = $el.closest('.radio');
// eslint-disable-next-line no-nested-ternary
fieldset = fieldset.nodeName === 'FIELDSET' ? fieldset : (fieldset.parentElement.nodeName === 'FIELDSET' ? fieldset.parentElement : false);
/**
* Look for one of:
* - <fieldset class="radio"></fieldset>
* - <fieldset><div class="radio"></div></fieldset>
* - <fieldset><div class="switcher"></div></fieldset>
*/
let fieldset = $el.closest('.radio, .switcher, fieldset');
if (fieldset) {
// eslint-disable-next-line no-nested-ternary
fieldset = fieldset.nodeName === 'FIELDSET' ? fieldset : (fieldset.parentElement.nodeName === 'FIELDSET' ? fieldset.parentElement : false);
}

if (fieldset) {
const oldSetId = fieldset.id;
Expand Down