Skip to content

Upmerge20230721 3 #41204

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

Merged
MacJoom merged 3 commits into from
Jul 21, 2023
Merged

Upmerge20230721 3 #41204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8c9cf8
Fix for TypeError: count() in webservices when running PHP 8.x (#40610)
MacJoom Jul 20, 2023
6a1a72a
blur event listeners on target elements must make sure there is an ac…
GeraintEdwards Jul 20, 2023
6b40380
Merge branch '4.3-dev' into Upmerge20230721-3
MacJoom Jul 21, 2023
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
33 changes: 17 additions & 16 deletions administrator/components/com_fields/src/Model/GroupModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,29 +240,30 @@ protected function preprocessForm(Form $form, $data, $group = 'content')

$parts = FieldsHelper::extract($this->state->get('filter.context'));

// If we don't have a valid context then return early
if (!$parts) {
return;
}

// Extract the component name
$component = $parts[0];

// Extract the optional section name
$section = (count($parts) > 1) ? $parts[1] : null;
// Extract the section name
$section = $parts[1];

if ($parts) {
// Set the access control rules field component value.
$form->setFieldAttribute('rules', 'component', $component);
}
// Set the access control rules field component value.
$form->setFieldAttribute('rules', 'component', $component);

if ($section !== null) {
// Looking first in the component models/forms folder
$path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
// Looking first in the component models/forms folder
$path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');

if (file_exists($path)) {
$lang = Factory::getLanguage();
$lang->load($component, JPATH_BASE);
$lang->load($component, JPATH_BASE . '/components/' . $component);
if (file_exists($path)) {
$lang = Factory::getLanguage();
$lang->load($component, JPATH_BASE);
$lang->load($component, JPATH_BASE . '/components/' . $component);

if (!$form->loadFile($path, false)) {
throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
}
if (!$form->loadFile($path, false)) {
throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,35 @@ function addStepToTourButton(tour, stepObj, buttons) {
if (target.tagName.toLowerCase() === 'iframe') {
// Give blur to the content of the iframe, as iframes don't have blur events
target.contentWindow.document.body.addEventListener('blur', (event) => {
if (!sessionStorage.getItem('tourId')) {
return;
}
setTimeout(() => {
setFocus(primaryButton, secondaryButton, cancelButton);
}, 1);
event.preventDefault();
});
} else if (target.tagName.toLowerCase() === 'joomla-field-fancy-select') {
target.querySelector('.choices input').addEventListener('blur', (event) => {
if (!sessionStorage.getItem('tourId')) {
return;
}
setFocus(primaryButton, secondaryButton, cancelButton);
event.preventDefault();
});
} else if (target.parentElement.tagName.toLowerCase() === 'joomla-field-fancy-select') {
target.querySelector('input').addEventListener('blur', (event) => {
if (!sessionStorage.getItem('tourId')) {
return;
}
setFocus(primaryButton, secondaryButton, cancelButton);
event.preventDefault();
});
} else {
target.addEventListener('blur', (event) => {
if (!sessionStorage.getItem('tourId')) {
return;
}
setFocus(primaryButton, secondaryButton, cancelButton);
event.preventDefault();
});
Expand Down Expand Up @@ -356,6 +368,9 @@ function startTour(obj) {
switch (obj.steps[index].interactive_type) {
case 'submit':
ele.addEventListener('click', () => {
if (!sessionStorage.getItem('tourId')) {
return;
}
sessionStorage.setItem('currentStepId', obj.steps[index].id + 1);
});
break;
Expand All @@ -364,6 +379,9 @@ function startTour(obj) {
ele.step_id = index;
if (ele.hasAttribute('required') && ['email', 'password', 'search', 'tel', 'text', 'url'].includes(ele.type)) {
['input', 'focus'].forEach((eventName) => ele.addEventListener(eventName, (event) => {
if (!sessionStorage.getItem('tourId')) {
return;
}
if (event.target.value.trim().length) {
enableButton(event);
} else {
Expand Down