From b27475483e1de00b5136b0e14b9f89e9b44a382e Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Wed, 31 Aug 2022 16:06:54 +0000
Subject: [PATCH] copy name attribute for dialog buttons, fixes #1490
Closes #1490
Merge request studip/studip!941
---
resources/assets/javascripts/lib/dialog.js | 23 +++++++++-------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/resources/assets/javascripts/lib/dialog.js b/resources/assets/javascripts/lib/dialog.js
index 0efd76f3612..23a17af619f 100644
--- a/resources/assets/javascripts/lib/dialog.js
+++ b/resources/assets/javascripts/lib/dialog.js
@@ -34,23 +34,18 @@ function extractButtons(element) {
var cancel = $(this).is('.cancel');
var index = cancel ? 'cancel' : label;
var classes = $(this).attr('class') || '';
+ var name = $(this).attr('name') || '';
+ var disabled = $(this).is(':disabled');
classes = classes.replace(/\bbutton\b/, '').trim();
- if ($(this).is('.accept,.cancel')) {
- buttons[index] = {
- text: label,
- click: () => this.click()
- };
- } else {
- buttons[index] = () => this.click();
- }
-
- if ($(this).is(':disabled')) {
- classes = classes + ' disabled';
- }
-
- buttons[index]['class'] = classes;
+ buttons[index] = {
+ text: label,
+ class: classes,
+ name: name,
+ disabled: disabled,
+ click: () => this.click()
+ };
});
return buttons;
--
GitLab