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 | 08e02c3dad4d2fa765b11ae58313b3f3e375e447 (patch) | |
| tree | 4693838432e0c544944b137ab246fbcc4583d848 | |
| parent | 91f7d11435125e968c5bdbfc291929358cab91e3 (diff) | |
| parent | 3895599c8f6ddc987a5c92ded800228547348dc6 (diff) | |
| download | chat-08e02c3dad4d2fa765b11ae58313b3f3e375e447.tar.gz chat-08e02c3dad4d2fa765b11ae58313b3f3e375e447.tar.bz2 chat-08e02c3dad4d2fa765b11ae58313b3f3e375e447.zip | |
Merge pull request #7 from rgarmsen2295/mm-1004
MM-1004
| -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> |