aboutsummaryrefslogtreecommitdiff
path: root/src/components/post_status_form
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-02-04 16:48:13 +0000
committerShpuld Shpludson <shp@cock.li>2019-02-04 16:48:13 +0000
commitd5757d44e5596f7e3de59d5420bb30b237a0533c (patch)
treeca469029857ea69111bab41bbd0a52e05afd7c0b /src/components/post_status_form
parentbb335ea71b7e94dd39b583e039e4e42d05ed807d (diff)
parent97fbc1d402e611103787abaa0a63b1c7fef47bd0 (diff)
Merge branch 'issue-312-media-upload' into 'develop'
#312 - media uploader not working with same file in adjacent order See merge request pleroma/pleroma-fe!521
Diffstat (limited to 'src/components/post_status_form')
-rw-r--r--src/components/post_status_form/post_status_form.js1
-rw-r--r--src/components/post_status_form/post_status_form.vue2
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>