diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-15 10:20:21 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-15 10:20:21 -0800 |
commit | 6f10c401a422170d42d9cee8ec01b94808fa338f (patch) | |
tree | 3f86c6872aa94ee0530f8a6d2b7458fa655c11de /web/react | |
parent | 21a868728ac1283c110638dff84de21ae1990122 (diff) | |
parent | 2048b9567fd5bf005ed64106fa4f9038355f5669 (diff) | |
download | chat-6f10c401a422170d42d9cee8ec01b94808fa338f.tar.gz chat-6f10c401a422170d42d9cee8ec01b94808fa338f.tar.bz2 chat-6f10c401a422170d42d9cee8ec01b94808fa338f.zip |
Merge pull request #7 from rgarmsen2295/mm-1004
MM-1004
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/create_comment.jsx | 7 | ||||
-rw-r--r-- | web/react/components/post_deleted_modal.jsx | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 3534c7573..9bcbad079 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -55,12 +55,15 @@ module.exports = React.createClass({ }.bind(this), function(err) { - var state = {} + var state = {}; state.server_error = err.message; - this.setState(state); + if (err.message === "Invalid RootId parameter") { if ($('#post_deleted').length > 0) $('#post_deleted').modal('show'); } + else { + this.setState(state); + } }.bind(this) ); }, diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx index 307120df3..83b007bad 100644 --- a/web/react/components/post_deleted_modal.jsx +++ b/web/react/components/post_deleted_modal.jsx @@ -23,7 +23,7 @@ module.exports = React.createClass({ <p>Someone deleted the message on which you tried to post a comment.</p> </div> <div className="modal-footer"> - <button type="button" className="btn btn-primary" data-dismiss="modal">Agree</button> + <button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button> </div> </div> </div> |