diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-10-05 16:47:17 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-10-07 13:00:16 -0700 |
commit | be8225b761a3009efd1097a0b4dd4d8f44830a33 (patch) | |
tree | 7ec315e83228a16a9b3bdb316744dd956a4b9c61 /web/react/components/rhs_thread.jsx | |
parent | 16cee7f0702e7c18d131f0a30c0ba837abcc2a0c (diff) | |
download | chat-be8225b761a3009efd1097a0b4dd4d8f44830a33.tar.gz chat-be8225b761a3009efd1097a0b4dd4d8f44830a33.tar.bz2 chat-be8225b761a3009efd1097a0b4dd4d8f44830a33.zip |
Now handles commenting on a deleted post gracefully, and checks for any areas where data may no longer exist once a post has been deleted
Diffstat (limited to 'web/react/components/rhs_thread.jsx')
-rw-r--r-- | web/react/components/rhs_thread.jsx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx index fdcf618d7..27a784701 100644 --- a/web/react/components/rhs_thread.jsx +++ b/web/react/components/rhs_thread.jsx @@ -23,7 +23,7 @@ export default class RhsThread extends React.Component { } getStateFromStores() { var postList = PostStore.getSelectedPost(); - if (!postList || postList.order.length < 1) { + if (!postList || postList.order.length < 1 || !postList.posts[postList.order[0]]) { return {postList: {}}; } @@ -49,7 +49,10 @@ export default class RhsThread extends React.Component { }.bind(this)); } componentDidUpdate() { - $('.post-right__scroll').scrollTop($('.post-right__scroll')[0].scrollHeight); + if ($('.post-right__scroll')[0]) { + $('.post-right__scroll').scrollTop($('.post-right__scroll')[0].scrollHeight); + } + $('.post-right__scroll').perfectScrollbar('update'); this.resize(); } @@ -67,17 +70,10 @@ export default class RhsThread extends React.Component { // if something was changed in the channel like adding a // comment or post then lets refresh the sidebar list var currentSelected = PostStore.getSelectedPost(); - if (!currentSelected || currentSelected.order.length === 0) { + if (!currentSelected || currentSelected.order.length === 0 || !currentSelected.posts[currentSelected.order[0]]) { return; } - if (!currentSelected.posts[currentSelected.order[0]]) { - if ($('#post_deleted').length > 0) { - $('#post_deleted').modal('show'); - return; - } - } - var currentPosts = PostStore.getPosts(currentSelected.posts[currentSelected.order[0]].channel_id); if (!currentPosts || currentPosts.order.length === 0) { @@ -110,7 +106,7 @@ export default class RhsThread extends React.Component { render() { var postList = this.state.postList; - if (postList == null) { + if (postList == null || !postList.order) { return ( <div></div> ); |