commit: 205024ba9dec4b3baf3ae20636fb6c8eb680d11d
parent: 8778270381c6f2fffdf1c6a5eb09448a787aebd7
Author: Shpuld Shpuldson <shpuld@gmail.com>
Date: Thu, 24 Aug 2017 09:34:09 -0400
Merge branch 'feature/post-status-clear-error-message' into 'develop'
Feature/post status clear error message
See merge request !108
Diffstat:
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
@@ -88,6 +88,16 @@ const PostStatusForm = {
},
postStatus (newStatus) {
if (this.posting) { return }
+
+ if (this.newStatus.status === '') {
+ if (this.newStatus.files.length > 0) {
+ this.newStatus.status = '\u200b' // hack
+ } else {
+ this.error = 'Cannot post an empty status with no files'
+ return
+ }
+ }
+
this.posting = true
statusPoster.postStatus({
status: newStatus.status,
@@ -142,6 +152,9 @@ const PostStatusForm = {
if (e.target.value === '') {
e.target.style.height = '16px'
}
+ },
+ clearError () {
+ this.error = null
}
}
}
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -22,6 +22,7 @@
</div>
<div class='error' v-if="error">
Error: {{ error }}
+ <i class="icon-cancel" @click="clearError"></i>
</div>
<div class="attachments">
<div class="attachment" v-for="file in newStatus.files">
@@ -71,6 +72,7 @@
background-color: rgba(255, 48, 16, 0.65);
padding: 0.25em;
margin: 0.35em;
+ display: flex;
}
.attachments {