diff options
| author | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
| commit | 54e7e0e31babbfb0c4ebc2e1a73012e1b1890231 (patch) | |
| tree | 7533728f9f115f877806694960dcaeb48d28dbd7 /src/components/post_status_form | |
| parent | 18ae7bd5f366598d46a65e9da1312c98f7bb00e7 (diff) | |
| parent | 3cd1deb133926281920f10c1ddd6eb694c09f44d (diff) | |
merge develop and fix conflicts AGAIN
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 1 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 88bc736f..5e8c2252 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -250,6 +250,7 @@ const PostStatusForm = { visibility: newStatus.visibility, contentType: newStatus.contentType } + this.$refs.mediaUpload.clearFile() this.$emit('posted') let el = this.$el.querySelector('textarea') el.style.height = 'auto' diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 398f1871..e09ad37f 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -64,7 +64,7 @@ </div> </div> <div class='form-bottom'> - <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload> + <media-upload ref="mediaUpload" @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload> <p v-if="isOverLengthLimit" class="error">{{ charactersLeft }}</p> <p class="faint" v-else-if="hasStatusLengthLimit">{{ charactersLeft }}</p> |