From 67aebc1c03f15e168c8ad1009ed2cfb34089e568 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 5 Jun 2023 15:15:23 +0000
Subject: don't lose the toolbar, fixes #2373

Closes #2373

Merge request studip/studip!1824
---
 resources/vue/components/TextareaWithToolbar.vue | 17 +++++++++++++++--
 templates/forms/i18n_formatted_input.php         |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/resources/vue/components/TextareaWithToolbar.vue b/resources/vue/components/TextareaWithToolbar.vue
index 1f19864..498c5d1 100644
--- a/resources/vue/components/TextareaWithToolbar.vue
+++ b/resources/vue/components/TextareaWithToolbar.vue
@@ -1,17 +1,30 @@
 <template>
-    <textarea :name="name" ref="textarea"
-              v-bind="$attrs" v-on="$listeners"></textarea>
+    <textarea :name="name"
+              ref="textarea"
+              v-model="content"
+    ></textarea>
 </template>
 
 <script>
 export default {
     name: 'textarea-with-toolbar',
     props: {
+        value: String,
         name: {
             type: String,
             required: false
         }
     },
+    computed: {
+        content: {
+            get() {
+                return this.value;
+            },
+            set(newContent) {
+                this.$emit('input', newContent);
+            }
+        }
+    },
     mounted () {
         $(this.$refs.textarea).addToolbar();
     }
diff --git a/templates/forms/i18n_formatted_input.php b/templates/forms/i18n_formatted_input.php
index f47d775..4e667f5 100644
--- a/templates/forms/i18n_formatted_input.php
+++ b/templates/forms/i18n_formatted_input.php
@@ -7,7 +7,7 @@
             <span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
         <? endif ?>
     </label>
-    <i18n-textarea type="<?= \Config::get()->WYSIWYG ? 'wysiwyg' : 'textarea' ?>"
+    <i18n-textarea type="wysiwyg"
                    id="<?= $id ?>"
                    name="<?= htmlReady($name) ?>"
                    value="<?= htmlReady($value) ?>"
-- 
cgit v1.0