Troplo
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 97e072d93a c3690b456e
commit 115170f35d
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/emoji_input/emoji_input.js
View File

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

12
src/components/post_status_form/post_status_form.vue
View File

@ -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"

4
src/components/status_content/status_content.js
View File

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