diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 16:42:20 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 16:42:20 +0000 |
| commit | 153ad57007cb22d47e17ea96f34efd68f37134a9 (patch) | |
| tree | ef7d6bffeaacce63c3023c6013c8ad6fba40bc19 /src/components | |
| parent | 01d05316998f90451e920f8ac8d4c264a13b0cd7 (diff) | |
| parent | 932652e335d19cc6f97fae1a9b12501ffdb9ec0b (diff) | |
Merge branch '435-mastoapi-composing-new-post' into 'develop'
Transition to MastoAPI: composing new status and media upload
Closes #435
See merge request pleroma/pleroma-fe!686
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/media_upload/media_upload.js | 2 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js index 1c874faa..e4b3d460 100644 --- a/src/components/media_upload/media_upload.js +++ b/src/components/media_upload/media_upload.js @@ -20,7 +20,7 @@ const mediaUpload = { return } const formData = new FormData() - formData.append('media', file) + formData.append('file', file) self.$emit('uploading') self.uploading = true diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 3d1df91b..166691c2 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -84,10 +84,10 @@ <div class="media-upload-wrapper" v-for="file in newStatus.files"> <i class="fa button-icon icon-cancel" @click="removeMediaFile(file)"></i> <div class="media-upload-container attachment"> - <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img> - <video v-if="type(file) === 'video'" :src="file.image" controls></video> - <audio v-if="type(file) === 'audio'" :src="file.image" controls></audio> - <a v-if="type(file) === 'unknown'" :href="file.image">{{file.url}}</a> + <img class="thumbnail media-upload" :src="file.url" v-if="type(file) === 'image'"></img> + <video v-if="type(file) === 'video'" :src="file.url" controls></video> + <audio v-if="type(file) === 'audio'" :src="file.url" controls></audio> + <a v-if="type(file) === 'unknown'" :href="file.url">{{file.url}}</a> </div> </div> </div> |