commit: 6e800d9912239a748813c4d845b23207281cc0f6
parent: 3ab9b477f8b5d47e043d1088db3bed8688fffb95
Author: lambadalambda <gitgud@rogerbraun.net>
Date: Mon, 21 Aug 2017 08:57:50 -0400
Merge branch 'fix/lock-submit-until-post-returns' into 'develop'
fix/lock-submit-until-post-returns
See merge request !99
Diffstat:
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
@@ -40,6 +40,7 @@ const PostStatusForm = {
dropFiles: [],
submitDisabled: false,
error: null,
+ posting: false,
newStatus: {
status: statusText,
files: []
@@ -86,6 +87,7 @@ const PostStatusForm = {
this.caret = selectionStart
},
postStatus (newStatus) {
+ this.posting = true
statusPoster.postStatus({
status: newStatus.status,
media: newStatus.files,
@@ -104,6 +106,7 @@ const PostStatusForm = {
} else {
this.error = data.error
}
+ this.posting = false
})
},
addMediaFile (fileInfo) {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -17,7 +17,8 @@
</div>
<div class='form-bottom'>
<media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
- <button :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
+ <button v-if="posting" disabled class="btn btn-default base05 base01-background">Posting</button>
+ <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
</div>
<div class='error' v-if="error">
Error: {{ error }}
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
@@ -17,6 +17,11 @@ const postStatus = ({ store, status, media = [], inReplyToStatusId = undefined }
}
return data
})
+ .catch((err) => {
+ return {
+ error: err.message
+ }
+ })
}
const uploadMedia = ({ store, formData }) => {