diff options
author | Corey Hulen <corey@hulen.com> | 2015-10-15 11:42:01 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-10-15 11:42:01 -0700 |
commit | 5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5 (patch) | |
tree | da20ee242192263e0e0b2077e296876a8e250091 /web/react/components/rhs_thread.jsx | |
parent | f09685a37398da7808117b960321a14ab7989da7 (diff) | |
parent | 3d16d64c0ba2233b680e4ded01784a892c63e925 (diff) | |
download | chat-5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5.tar.gz chat-5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5.tar.bz2 chat-5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5.zip |
Merge pull request #1076 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/react/components/rhs_thread.jsx')
-rw-r--r-- | web/react/components/rhs_thread.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx index 41fd74adb..131253aa5 100644 --- a/web/react/components/rhs_thread.jsx +++ b/web/react/components/rhs_thread.jsx @@ -52,8 +52,6 @@ export default class RhsThread extends React.Component { if ($('.post-right__scroll')[0]) { $('.post-right__scroll').scrollTop($('.post-right__scroll')[0].scrollHeight); } - - $('.post-right__scroll').perfectScrollbar('update'); this.resize(); } componentWillUnmount() { @@ -100,8 +98,10 @@ export default class RhsThread extends React.Component { var height = $(window).height() - $('#error_bar').outerHeight() - 100; $('.post-right__scroll').css('height', height + 'px'); $('.post-right__scroll').scrollTop(100000); - $('.post-right__scroll').perfectScrollbar(); - $('.post-right__scroll').perfectScrollbar('update'); + if ($(window).width() > 768) { + $('.post-right__scroll').perfectScrollbar(); + $('.post-right__scroll').perfectScrollbar('update'); + } } render() { var postList = this.state.postList; |