diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-17 11:38:08 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-17 11:38:08 -0400 |
commit | 996f0d79a77744b701417e21881a2d09785d7494 (patch) | |
tree | f0a5c49824012823c855a301a8fdca27c32ca0d8 /web/react/components/sidebar_right.jsx | |
parent | 1c65fe1f84b3dca201530817dc2690f7de57deaa (diff) | |
parent | 646214b49b47752cf170d7e6677e9464c2a3f786 (diff) | |
download | chat-996f0d79a77744b701417e21881a2d09785d7494.tar.gz chat-996f0d79a77744b701417e21881a2d09785d7494.tar.bz2 chat-996f0d79a77744b701417e21881a2d09785d7494.zip |
Merge pull request #386 from mattermost/revert-372-MM-1640
Revert "Mm 1640 Fixed odd scrolling issues on channel refresh"
Diffstat (limited to 'web/react/components/sidebar_right.jsx')
-rw-r--r-- | web/react/components/sidebar_right.jsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx index 7ceccb45c..8334b345b 100644 --- a/web/react/components/sidebar_right.jsx +++ b/web/react/components/sidebar_right.jsx @@ -38,6 +38,10 @@ module.exports = React.createClass({ } } }, + resize: function() { + $(".post-list-holder-by-time").scrollTop(100000); + $(".post-list-holder-by-time").perfectScrollbar('update'); + }, getInitialState: function() { return getStateFromStores(); }, @@ -45,6 +49,7 @@ module.exports = React.createClass({ if (! (this.state.search_visible || this.state.post_right_visible)) { $('.inner__wrap').removeClass('move--left').removeClass('move--right'); $('.sidebar--right').removeClass('move--left'); + this.resize(); return ( <div></div> ); @@ -54,6 +59,7 @@ module.exports = React.createClass({ $('.sidebar--left').removeClass('move--right'); $('.sidebar--right').addClass('move--left'); $('.sidebar--right').prepend('<div class="sidebar__overlay"></div>'); + this.resize(); setTimeout(function(){ $('.sidebar__overlay').fadeOut("200", function(){ $(this).remove(); |