pleroma-fe

commit: 115170f35dbbd9656f64325e6f4c7b58b8b9c07f
parent 97e072d93a50c45a4a16bbdc6273266b31f4d095
Author: Henry Jameson <me@hjkos.com>
Date:   Wed, 30 Mar 2022 01:26:35 +0300

Merge branch 'vue3-again' into vue3-no-compat

* vue3-again:
  fix emoji input warning spam
  fix error clear icon
  Add controlledShowingLongSubject and toggle in StatusContent props

Diffstat:
M
src/components/emoji_input/emoji_input.js
2
+-
M
src/components/post_status_form/post_status_form.vue
12
++++++++----
M
src/components/status_content/status_content.js
4
+++-

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
@@ -31,7 +31,7 @@ library.add(
  */
 
 const EmojiInput = {
-  emits: ['update:modelValue'],
+  emits: ['update:modelValue', 'shown'],
   props: {
     suggest: {
       /**
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -282,11 +282,15 @@
         class="alert error"
       >
         Error: {{ error }}
-        <FAIcon
-          class="fa-scale-110 fa-old-padding"
-          icon="times"
+        <button
+          class="button-unstyled"
           @click="clearError"
-        />
+        >
+          <FAIcon
+            class="fa-scale-110 fa-old-padding"
+            icon="times"
+          />
+        </button>
       </div>
       <gallery
         v-if="newStatus.files && newStatus.files.length > 0"
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
@@ -59,7 +59,9 @@ const StatusContent = {
     'controlledShowingTall',
     'controlledExpandingSubject',
     'controlledToggleShowingTall',
-    'controlledToggleExpandingSubject'
+    'controlledToggleExpandingSubject',
+    'controlledShowingLongSubject',
+    'controlledToggleShowingLongSubject'
   ],
   data () {
     return {