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
This commit is contained in:
Henry Jameson 2022-03-30 01:26:35 +03:00
commit 115170f35d
3 changed files with 12 additions and 6 deletions

View File

@ -31,7 +31,7 @@ library.add(
*/
const EmojiInput = {
emits: ['update:modelValue'],
emits: ['update:modelValue', 'shown'],
props: {
suggest: {
/**

View File

@ -282,11 +282,15 @@
class="alert error"
>
Error: {{ error }}
<button
class="button-unstyled"
@click="clearError"
>
<FAIcon
class="fa-scale-110 fa-old-padding"
icon="times"
@click="clearError"
/>
</button>
</div>
<gallery
v-if="newStatus.files && newStatus.files.length > 0"

View File

@ -59,7 +59,9 @@ const StatusContent = {
'controlledShowingTall',
'controlledExpandingSubject',
'controlledToggleShowingTall',
'controlledToggleExpandingSubject'
'controlledToggleExpandingSubject',
'controlledShowingLongSubject',
'controlledToggleShowingLongSubject'
],
data () {
return {