fix selection of elements on timesrooms dialog. fixes #6364

Closes #6364

Merge request studip/studip!4822

10 files changed, 13 insertions, 27 deletions

diff --git a/app/views/admin/autoinsert/manual.php b/app/views/admin/autoinsert/manual.php
index b739967..8b73101 100644
--- a/app/views/admin/autoinsert/manual.php
+++ b/app/views/admin/autoinsert/manual.php
@@ -79,7 +79,6 @@
                         </select>
                         <?= Icon::create('add')->asInput([
                             'title' => _('Filter hinzufügen'),
-                            'type'  => 'image',
                             'class' => 'middle',
                             'name'  => 'add_filter',
                         ]) ?>
@@ -106,7 +105,6 @@
                         <label for="<?= $type ?>"><b><?= $available_filtertypes[$type] ?></b></label>
                         <?= Icon::create('remove')->asInput([
                             'title' => _('Filter entfernen'),
-                            'type'  => 'image',
                             'class' => 'middle',
                             'name'  => "remove_filter[{$type}]",
                         ]) ?>
@@ -161,7 +159,6 @@
                     <?= Studip\Button::create(_('Eintragen'), 'submit') ?>
                     <?= Icon::create('question-circle')->asInput([
                         'title' => _('Vorschau'),
-                        'type' => 'image',
                         'style' => 'vertical-align: middle;',
                         'name' => 'preview'
                     ]) ?>
diff --git a/app/views/admin/role/assign_plugin_role.php b/app/views/admin/role/assign_plugin_role.php
index 471a087..28f5561 100644
--- a/app/views/admin/role/assign_plugin_role.php
+++ b/app/views/admin/role/assign_plugin_role.php
@@ -56,10 +56,10 @@ use Studip\Button;
                     </select>
                 </td>
                 <td style="text-align: center;">
-                    <?= Icon::create('arr_2left', 'sort', ['title' => _('Markierte Rollen dem Plugin zuweisen')])->asInput(["type" => "image", "class" => "middle", "name" => "assign_role"]) ?>
+                    <?= Icon::create('arr_2left', 'sort', ['title' => _('Markierte Rollen dem Plugin zuweisen')])->asInput(["class" => "middle", "name" => "assign_role"]) ?>
                     <br>
                     <br>
-                    <?= Icon::create('arr_2right', 'sort', ['title' => _('Markierte Rollen entfernen')])->asInput(["type" => "image", "class" => "middle", "name" => "remove_role"]) ?>
+                    <?= Icon::create('arr_2right', 'sort', ['title' => _('Markierte Rollen entfernen')])->asInput(["class" => "middle", "name" => "remove_role"]) ?>
                 </td>
                 <td>
                     <select multiple name="rolesel[]" size="10" style="width: 300px;">
diff --git a/app/views/admin/role/assign_role.php b/app/views/admin/role/assign_role.php
index 8215f41..d4cd2eb 100644
--- a/app/views/admin/role/assign_role.php
+++ b/app/views/admin/role/assign_role.php
@@ -75,10 +75,10 @@ use Studip\Button, Studip\LinkButton;
                     </select>
                 </td>
                 <td style="text-align: center;">
-                    <?= Icon::create('arr_2left', 'sort', ['title' => _('Markierte Rollen dem Benutzer zuweisen')])->asInput(["type" => "image", "class" => "middle", "name" => "assign_role"]) ?>
+                    <?= Icon::create('arr_2left', 'sort', ['title' => _('Markierte Rollen dem Benutzer zuweisen')])->asInput(["class" => "middle", "name" => "assign_role"]) ?>
                     <br>
                     <br>
-                    <?= Icon::create('arr_2right', 'sort', ['title' => _('Markierte Rollen entfernen')])->asInput(["type" => "image", "class" => "middle", "name" => "remove_role"]) ?>
+                    <?= Icon::create('arr_2right', 'sort', ['title' => _('Markierte Rollen entfernen')])->asInput(["class" => "middle", "name" => "remove_role"]) ?>
                 </td>
                 <td>
                     <select size="10" name="rolesel[]" multiple style="width: 300px;">
diff --git a/app/views/course/room_requests/new_request.php b/app/views/course/room_requests/new_request.php
index 29733c9..4047c4c 100644
--- a/app/views/course/room_requests/new_request.php
+++ b/app/views/course/room_requests/new_request.php
@@ -29,7 +29,6 @@
                         <?= Icon::create('decline')->asInput(
                             [
                                 'title' => _('alle Angaben zurücksetzen'),
-                                'type'  => 'image',
                                 'class' => 'text-bottom',
                                 'name'  => 'reset_category',
                                 'style' => 'margin-left: 0.2em; margin-top: 0.6em;'
@@ -39,7 +38,6 @@
                         <?= Icon::create('accept')->asInput(
                             [
                                 'title' => _('Raumtyp auswählen'),
-                                'type'  => 'image',
                                 'class' => 'text-bottom',
                                 'name'  => 'search_by_category',
                                 'value' => _('Raumtyp auswählen'),
@@ -70,7 +68,6 @@
                         <? if (!empty($room_name)) : ?>
                             <?= Icon::create('decline')->asInput([
                                 'title' => _('alle Angaben zurücksetzen'),
-                                'type'  => 'image',
                                 'class' => 'text-bottom',
                                 'name'  => 'reset_name',
                                 'style' => 'margin-left: 0.2em; margin-top: 0.6em;',
diff --git a/app/views/course/room_requests/request_find_available_properties.php b/app/views/course/room_requests/request_find_available_properties.php
index 03c0103..ca0ecba 100644
--- a/app/views/course/room_requests/request_find_available_properties.php
+++ b/app/views/course/room_requests/request_find_available_properties.php
@@ -46,7 +46,6 @@
                             <?= Icon::create('accept')->asInput(
                                 [
                                     'title' => _('Raumtyp auswählen'),
-                                    'type'  => 'image',
                                     'class' => 'text-bottom',
                                     'name'  => 'search_by_category',
                                     'value' => _('Raumtyp auswählen'),
@@ -57,7 +56,6 @@
                             <?= Icon::create('decline')->asInput(
                                 [
                                     'title' => _('alle Angaben zurücksetzen'),
-                                    'type'  => 'image',
                                     'class' => 'text-bottom',
                                     'name'  => 'reset_category',
                                     'style' => 'margin-left: 0.2em; margin-top: 0.6em;'
diff --git a/app/views/course/room_requests/request_find_matching_rooms.php b/app/views/course/room_requests/request_find_matching_rooms.php
index 1ad8e1d..d5a88a5 100644
--- a/app/views/course/room_requests/request_find_matching_rooms.php
+++ b/app/views/course/room_requests/request_find_matching_rooms.php
@@ -33,7 +33,6 @@
                         <?= Icon::create('accept')->asInput(
                             [
                                 'title' => _('Raumtyp auswählen'),
-                                'type'  => 'image',
                                 'class' => 'text-bottom',
                                 'name'  => 'select_properties',
                                 'value' => _('Raumtyp auswählen'),
@@ -45,7 +44,6 @@
                             <?= Icon::create('decline')->asInput(
                                 [
                                     'title' => _('alle Angaben zurücksetzen'),
-                                    'type'  => 'image',
                                     'class' => 'text-bottom',
                                     'name'  => 'reset_category',
                                     'style' => 'margin-left: 0.2em; margin-top: 0.6em;'
diff --git a/app/views/course/studygroup/_choose_founders.php b/app/views/course/studygroup/_choose_founders.php
index ca47782..bd25fe0 100644
--- a/app/views/course/studygroup/_choose_founders.php
+++ b/app/views/course/studygroup/_choose_founders.php
@@ -14,13 +14,11 @@
                 </select>
                 <?= Icon::create('accept')->asInput([
                     'title' => _('NutzerIn hinzufügen'),
-                    'type'  => 'image',
                     'class' => 'middle',
                     'name' => 'add_founder'
                 ]) ?>
                 <?= Icon::create('refresh')->asInput([
                     'title' => _('neue Suche starten'),
-                    'type'  => 'image',
                     'class' => 'middle',
                     'name' => 'new_search',
                 ]) ?>
@@ -31,7 +29,6 @@
                 <input type="text" name="search_for_founder">
                 <?= Icon::create('search')->asInput([
                     'title' => _('Suchen'),
-                    'type'  => 'image',
                     'class' => 'middle',
                     'name' => 'search_founder',
                 ]) ?>
@@ -48,7 +45,7 @@
 
                     <?= htmlReady(get_fullname($user_id, 'full_rev')) ?> (<?= get_username($user_id) ?>)
                     <input type="hidden" name="founders[]" value="<?= $user_id ?>">
-                    <?= Icon::create('refresh', 'clickable', ['title' => _('NutzerIn entfernen')])->asInput(["type" => "image", "class" => "middle", "name" => "remove_founder"]) ?>
+                    <?= Icon::create('refresh', 'clickable', ['title' => _('NutzerIn entfernen')])->asInput(["class" => "middle", "name" => "remove_founder"]) ?>
                     <br>
                 <? endforeach; ?>
             <? endif; ?>
diff --git a/app/views/course/timesrooms/_cycleRow.php b/app/views/course/timesrooms/_cycleRow.php
index ce286ed..4b3c29f 100644
--- a/app/views/course/timesrooms/_cycleRow.php
+++ b/app/views/course/timesrooms/_cycleRow.php
@@ -103,7 +103,6 @@ $is_exTermin = $termin instanceof CourseExDate;
         ) ?>
 
         <? $params = [
-            'type'         => 'image',
             'class'        => 'middle',
             'name'         => 'delete_single_date',
             'data-confirm' => _('Diesen Termin wiederherstellen?'),
diff --git a/resources/assets/javascripts/lib/dialog.js b/resources/assets/javascripts/lib/dialog.js
index 55729e2..db20449 100644
--- a/resources/assets/javascripts/lib/dialog.js
+++ b/resources/assets/javascripts/lib/dialog.js
@@ -727,8 +727,8 @@ Dialog.initialize = function() {
 
     // Actual dialog handler
     function dialogHandler(event) {
-        if (!event.isDefaultPrevented() && checkValidity(event.currentTarget)) {
-            let target = $(event.target).closest('[data-dialog]');
+        if (!event.isDefaultPrevented() && checkValidity(this)) {
+            let target = $(this).closest('[data-dialog]');
             let options = target.data().dialog;
 
             if (
@@ -746,13 +746,13 @@ Dialog.initialize = function() {
     }
 
     function clickHandler(event) {
-        if (!event.isDefaultPrevented() && checkValidity(event.currentTarget)) {
-            var element = $(event.target).closest(':submit,input[type="image"]');
+        if (!event.isDefaultPrevented() && checkValidity(this)) {
+            var element = $(this).closest(':submit,input[type="image"]');
             var form = element.closest('form');
             var action = element.attr('formaction');
             form.data('triggeredBy', {
-                name: $(event.target).attr('name'),
-                value: $(event.target).val()
+                name: $(this).attr('name'),
+                value: $(this).val()
             });
             if (action) {
                 form.data('formaction', action);
diff --git a/templates/admin/adminList.php b/templates/admin/adminList.php
index a0b7ee0..ee4cccd 100644
--- a/templates/admin/adminList.php
+++ b/templates/admin/adminList.php
@@ -4,5 +4,5 @@
         <option title="<?= htmlReady($seminar['VeranstaltungsNummer'] . ' ' . $seminar['Name']) ?>" value="<?= htmlReady($seminar['Seminar_id']) ?>"<?= ($seminar['Seminar_id'] === $course_id ? " selected" : "") ?>><?= htmlReady(my_substr($seminar['Name'],0,30)) ?></option>
     <? endforeach ?>
     </select>
-    <?= Icon::create('accept', 'accept', ['title' => _('Auswählen')])->asInput(["type" => 'image', "class" => 'text-top']) ?>
-</form>
\ No newline at end of file
+    <?= Icon::create('accept', 'accept', ['title' => _('Auswählen')])->asInput(["class" => 'text-top']) ?>
+</form>