summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-20 12:17:48 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-20 12:17:48 -0400
commit6a229964c7c5214a7e61bfbdca1f1fe966ac2363 (patch)
treeef111d28fa857b41f89f7cc4574847e565544f45 /web
parent1c06c3fa091fee38978c76521120de196b7d74a8 (diff)
parentaf56bed1a33cc4b5af696b04e156f23dbd25a369 (diff)
downloadchat-6a229964c7c5214a7e61bfbdca1f1fe966ac2363.tar.gz
chat-6a229964c7c5214a7e61bfbdca1f1fe966ac2363.tar.bz2
chat-6a229964c7c5214a7e61bfbdca1f1fe966ac2363.zip
Merge pull request #204 from nickago/MM-1519
MM-1519 Even on error, submission stops, updated to relect that
Diffstat (limited to 'web')
-rw-r--r--web/react/components/create_comment.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 9e3feb25c..6ed0f0b34 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -43,7 +43,7 @@ module.exports = React.createClass({
client.createPost(post, ChannelStore.getCurrent(),
function(data) {
- this.setState({ messageText: '', submitting: false, post_error: null });
+ this.setState({ messageText: '', submitting: false, post_error: null, server_error: null });
this.clearPreviews();
AsyncClient.getPosts(true, this.props.channelId);
@@ -57,6 +57,7 @@ module.exports = React.createClass({
function(err) {
var state = {};
state.server_error = err.message;
+ state.submitting = false;
if (err.message === "Invalid RootId parameter") {
if ($('#post_deleted').length > 0) $('#post_deleted').modal('show');