diff options
| author | Henry Jameson <me@hjkos.com> | 2022-03-30 01:26:35 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-03-30 01:26:35 +0300 |
| commit | 115170f35dbbd9656f64325e6f4c7b58b8b9c07f (patch) | |
| tree | 9b63d10ee8ee18e0bb2ed85c988d2c4f151ee413 /src | |
| parent | 97e072d93a50c45a4a16bbdc6273266b31f4d095 (diff) | |
| parent | c3690b456e66585598f05d71643089a5e9770af7 (diff) | |
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 (limited to 'src')
| -rw-r--r-- | src/components/emoji_input/emoji_input.js | 2 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 12 | ||||
| -rw-r--r-- | 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 index e772bf75..391cc5b5 100644 --- 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 index 8c0b74a3..0fdb6dc7 100644 --- 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 index e69c3afd..89f0aa51 100644 --- 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 { |