From 82c7bf24585b77fa96de1ad2eb754d371015196e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 25 Sep 2024 13:53:19 +0000
Subject: [PATCH] trigger change on proxied elements as well, fixes #3467
Closes #3467
Merge request studip/studip!3442
---
.../bootstrap/studip_helper_attributes.js | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/resources/assets/javascripts/bootstrap/studip_helper_attributes.js b/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
index aea1823eb8f..9f245304242 100644
--- a/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
+++ b/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
@@ -7,7 +7,7 @@ import { $gettext } from '../lib/gettext';
var proxy_elements_selector = ':checkbox[data-proxyfor], :radio[data-proxyfor]';
var proxied_elements_selector = ':checkbox[data-proxiedby], :radio[data-proxiedby]';
-function connectProxyAndProxied(event) {
+function connectProxyAndProxied() {
$(proxy_elements_selector).each(function () {
const proxy = $(this);
const proxyId = proxy.uniqueId().attr('id');
@@ -15,7 +15,9 @@ function connectProxyAndProxied(event) {
// The following seems like a hack but works perfectly fine.
$(proxied).each(function () {
const proxiedBy = ($(this).attr('data-proxiedby') || '').split(',').filter(a => a.length > 0);
- proxiedBy.push(`#${proxyId}`);
+ if (!proxiedBy.includes(`#${proxyId}`)) {
+ proxiedBy.push(`#${proxyId}`);
+ }
$(this)
.attr('data-proxiedby', proxiedBy.join(','))
@@ -40,9 +42,10 @@ $(document).on('change', proxy_elements_selector, function (event, force) {
$(proxiedBy)
.filter((idx, item) => item !== this)
.trigger('update.proxy');
- })
- .filter('[data-proxyfor]')
- .trigger('change', [true]);
+
+ const event = new Event('change');
+ element.dispatchEvent(event);
+ });
}
}).on('update.proxy', proxy_elements_selector, function () {
const proxied = $(this).data('proxyfor');
@@ -63,12 +66,12 @@ $(document).on('change', proxy_elements_selector, function (event, force) {
//button in the group, if the proxy is another element
//than the proxy for "this" element.
if ($(this).is(':radio')) {
- var proxy = $(this).data('proxiedby');
- var name = $(this).attr('name');
- var radio_button_group = $(`:radio[name="${name}"]`);
+ const proxy = $(this).data('proxiedby');
+ const name = $(this).attr('name');
+ const radio_button_group = $(`:radio[name="${name}"]`);
$(radio_button_group).each(function () {
- var button_proxy = $(this).data('proxiedby');
- if (button_proxy != proxy) {
+ const button_proxy = $(this).data('proxiedby');
+ if (button_proxy !== proxy) {
$(button_proxy).trigger('update.proxy');
}
});
@@ -256,7 +259,7 @@ $(document).on('change', 'input[data-must-equal]', function() {
//Generalisation: The enter-accessible class allows an element to be accessible via keyboard
//by triggering the click event when the enter key is pressed.
$(document).on('keydown', '.enter-accessible', function(event) {
- if (event.code == 'Enter') {
+ if (event.code === 'Enter') {
//The enter key has been pressed.
event.preventDefault();
$(this).trigger('click');
--
GitLab