From f59e6bd9e965bf426f944d0f7484bab1ba2719f5 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 2 Apr 2024 08:23:11 +0000
Subject: [PATCH] fix #3829 for 5.5+
Closes #3829
Merge request studip/studip!2778
---
resources/vue/components/StudipDialog.vue | 10 +++++++++-
.../blocks/CoursewareBiographyCareerBlock.vue | 4 ++--
.../courseware/blocks/CoursewareImageMapBlock.vue | 4 ++--
.../courseware/blocks/CoursewareKeyPointBlock.vue | 4 ++--
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/resources/vue/components/StudipDialog.vue b/resources/vue/components/StudipDialog.vue
index f14dd371e57..0edd3c53b28 100644
--- a/resources/vue/components/StudipDialog.vue
+++ b/resources/vue/components/StudipDialog.vue
@@ -1,6 +1,6 @@
<template>
<MountingPortal mountTo="body" append>
- <focus-trap v-model="trap" :initial-focus="() => defaultFocus ? $refs.buttonB : null">
+ <focus-trap v-model="trap">
<div class="studip-dialog" @keydown.esc="closeDialog">
<transition name="dialog-fade">
<div class="studip-dialog-backdrop">
@@ -262,5 +262,13 @@ export default {
return typeof value !== "number" ? 0 : value;
}
},
+ mounted() {
+ if (this.defaultFocus) {
+ this.$nextTick()
+ .then(() => {
+ this.$refs.buttonB.focus();
+ });
+ }
+ }
};
</script>
diff --git a/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue b/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue
index c366618d702..98fab71015e 100644
--- a/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue
@@ -17,8 +17,8 @@
class="cw-timeline-item"
>
<div class="cw-timeline-item-icon cw-timeline-item-icon-color-studip-blue">
- <studip-icon v-if="item.type === 'school'" shape="doctoral-cap" role="clickable" size="32"/>
- <studip-icon v-if="item.type === 'experience'" shape="tools" role="clickable" size="32"/>
+ <studip-icon v-if="item.type === 'school'" shape="doctoral-cap" role="clickable" :size="32"/>
+ <studip-icon v-if="item.type === 'experience'" shape="tools" role="clickable" :size="32"/>
</div>
<div
class="cw-timeline-item-content cw-timeline-item-content-color-studip-blue"
diff --git a/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue b/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue
index 6d129801ef5..4f52d4b57d7 100644
--- a/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue
@@ -113,7 +113,7 @@
>
<template #open-indicator="selectAttributes">
<span v-bind="selectAttributes"
- ><studip-icon shape="arr_1down" size="10"
+ ><studip-icon shape="arr_1down" :size="10"
/></span>
</template>
<template #no-options>
@@ -141,7 +141,7 @@
>
<template #open-indicator="selectAttributes">
<span v-bind="selectAttributes"
- ><studip-icon shape="arr_1down" size="10"
+ ><studip-icon shape="arr_1down" :size="10"
/></span>
</template>
<template #no-options>
diff --git a/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue b/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
index a4107408635..e52b608a009 100644
--- a/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
@@ -38,7 +38,7 @@
v-model="currentColor"
>
<template #open-indicator="selectAttributes">
- <span v-bind="selectAttributes"><studip-icon shape="arr_1down" size="10" /></span>
+ <span v-bind="selectAttributes"><studip-icon shape="arr_1down" :size="10" /></span>
</template>
<template #no-options>
{{ $gettext('Es steht keine Auswahl zur Verfügung.') }}
@@ -57,7 +57,7 @@
{{ $gettext('Icon') }}
<studip-select :options="icons" :clearable="false" v-model="currentIcon">
<template #open-indicator="selectAttributes">
- <span v-bind="selectAttributes"><studip-icon shape="arr_1down" size="10" /></span>
+ <span v-bind="selectAttributes"><studip-icon shape="arr_1down" :size="10" /></span>
</template>
<template #no-options>
{{ $gettext('Es steht keine Auswahl zur Verfügung.') }}
--
GitLab