diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-31 17:45:29 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-31 17:45:29 +0000 |
| commit | f71f101fce21ec053d46556928393a5f05f16239 (patch) | |
| tree | 7b880c9c76502c57d455e81a8477e273d8178049 /src/components/post_status_form | |
| parent | 1d1ea7e703891ec48dfcbd2fc8090656cef1e36a (diff) | |
| parent | afdc61b9b7088f5d9880a4a8466461bd8c5aeb78 (diff) | |
Merge branch 'vue3-again' into 'develop'
Migration to Vue 3 (again)
See merge request pleroma/pleroma-fe!1385
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 6 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index fe07309f..84a9e29e 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -78,6 +78,12 @@ const PostStatusForm = { 'emojiPickerPlacement', 'optimisticPosting' ], + emits: [ + 'posted', + 'resize', + 'mediaplay', + 'mediapause' + ], components: { MediaUpload, EmojiInput, diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 2e0980a2..0fdb6dc7 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -18,11 +18,12 @@ <FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'" /> </div> <div class="form-group"> - <i18n + <i18n-t v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning" - path="post_status.account_not_locked_warning" + keypath="post_status.account_not_locked_warning" tag="p" class="visibility-notice" + scope="global" > <button class="button-unstyled -link" @@ -30,7 +31,7 @@ > {{ $t('post_status.account_not_locked_warning_link') }} </button> - </i18n> + </i18n-t> <p v-if="!hideScopeNotice && newStatus.visibility === 'public'" class="visibility-notice notice-dismissible" @@ -281,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" |