forked from mirrors/akkoma-fe
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:
commit
115170f35d
3 changed files with 12 additions and 6 deletions
|
@ -31,7 +31,7 @@ library.add(
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const EmojiInput = {
|
const EmojiInput = {
|
||||||
emits: ['update:modelValue'],
|
emits: ['update:modelValue', 'shown'],
|
||||||
props: {
|
props: {
|
||||||
suggest: {
|
suggest: {
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -282,11 +282,15 @@
|
||||||
class="alert error"
|
class="alert error"
|
||||||
>
|
>
|
||||||
Error: {{ error }}
|
Error: {{ error }}
|
||||||
<FAIcon
|
<button
|
||||||
class="fa-scale-110 fa-old-padding"
|
class="button-unstyled"
|
||||||
icon="times"
|
|
||||||
@click="clearError"
|
@click="clearError"
|
||||||
/>
|
>
|
||||||
|
<FAIcon
|
||||||
|
class="fa-scale-110 fa-old-padding"
|
||||||
|
icon="times"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<gallery
|
<gallery
|
||||||
v-if="newStatus.files && newStatus.files.length > 0"
|
v-if="newStatus.files && newStatus.files.length > 0"
|
||||||
|
|
|
@ -59,7 +59,9 @@ const StatusContent = {
|
||||||
'controlledShowingTall',
|
'controlledShowingTall',
|
||||||
'controlledExpandingSubject',
|
'controlledExpandingSubject',
|
||||||
'controlledToggleShowingTall',
|
'controlledToggleShowingTall',
|
||||||
'controlledToggleExpandingSubject'
|
'controlledToggleExpandingSubject',
|
||||||
|
'controlledShowingLongSubject',
|
||||||
|
'controlledToggleShowingLongSubject'
|
||||||
],
|
],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
|
Loading…
Reference in a new issue