1 files changed, 13 insertions, 10 deletions

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 643b38af5..29728d368 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -4,6 +4,7 @@
 var PostStore = require('../stores/post_store.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
+var PreferenceStore = require('../stores/preference_store.jsx');
 var UserProfile = require('./user_profile.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 var Post = require('./post.jsx');
@@ -105,9 +106,10 @@ export default class PostList extends React.Component {
         PostStore.clearUnseenDeletedPosts(this.props.channelId);
         PostStore.addChangeListener(this.onChange);
         UserStore.addStatusesChangeListener(this.onTimeChange);
+        PreferenceStore.addChangeListener(this.onTimeChange);
         SocketStore.addChangeListener(this.onSocketChange);
 
-        const postHolder = $(React.findDOMNode(this.refs.postlist));
+        const postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
 
         $(window).resize(() => {
             this.resize();
@@ -133,7 +135,7 @@ export default class PostList extends React.Component {
 
             $('.top-visible-post').removeClass('top-visible-post');
 
-            $(React.findDOMNode(this.refs.postlistcontent)).children().each(function select() {
+            $(ReactDOM.findDOMNode(this.refs.postlistcontent)).children().each(function select() {
                 if ($(this).position().top + $(this).height() / 2 > 0) {
                     $(this).addClass('top-visible-post');
                     return false;
@@ -156,9 +158,10 @@ export default class PostList extends React.Component {
         PostStore.removeChangeListener(this.onChange);
         UserStore.removeStatusesChangeListener(this.onTimeChange);
         SocketStore.removeChangeListener(this.onSocketChange);
+        PreferenceStore.removeChangeListener(this.onTimeChange);
         $('body').off('click.userpopover');
         $(window).off('resize');
-        var postHolder = $(React.findDOMNode(this.refs.postlist));
+        var postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
         postHolder.off('scroll');
     }
     componentDidUpdate(prevProps, prevState) {
@@ -214,7 +217,7 @@ export default class PostList extends React.Component {
         }
     }
     componentWillUpdate() {
-        var postHolder = $(React.findDOMNode(this.refs.postlist));
+        var postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
         this.prevScrollTop = postHolder.scrollTop();
     }
     componentWillReceiveProps(nextProps) {
@@ -225,7 +228,7 @@ export default class PostList extends React.Component {
         }
     }
     resize() {
-        const postHolder = $(React.findDOMNode(this.refs.postlist));
+        const postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
         if ($('#create_post').length > 0) {
             const height = $(window).height() - $('#create_post').height() - $('#error_bar').outerHeight() - 50;
             postHolder.css('height', height + 'px');
@@ -233,12 +236,12 @@ export default class PostList extends React.Component {
     }
     scrollTo(val) {
         this.isUserScroll = false;
-        var postHolder = $(React.findDOMNode(this.refs.postlist));
+        var postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
         postHolder[0].scrollTop = val;
     }
     scrollToBottom(force) {
         this.isUserScroll = false;
-        var postHolder = $(React.findDOMNode(this.refs.postlist));
+        var postHolder = $(ReactDOM.findDOMNode(this.refs.postlist));
         if ($('#new_message_' + this.props.channelId)[0] && !this.userHasSeenNew && !force) {
             $('#new_message_' + this.props.channelId)[0].scrollIntoView();
         } else {
@@ -596,14 +599,14 @@ export default class PostList extends React.Component {
         var order = this.state.postList.order;
         var channelId = this.props.channelId;
 
-        $(React.findDOMNode(this.refs.loadmore)).text('Retrieving more messages...');
+        $(ReactDOM.findDOMNode(this.refs.loadmore)).text('Retrieving more messages...');
 
         Client.getPostsPage(
             channelId,
             order.length,
             Constants.POST_CHUNK_SIZE,
             function success(data) {
-                $(React.findDOMNode(this.refs.loadmore)).text('Load more messages');
+                $(ReactDOM.findDOMNode(this.refs.loadmore)).text('Load more messages');
                 this.gotMorePosts = true;
                 this.setState({numToDisplay: this.state.numToDisplay + Constants.POST_CHUNK_SIZE});
 
@@ -628,7 +631,7 @@ export default class PostList extends React.Component {
                 Client.getProfiles();
             }.bind(this),
             function fail(err) {
-                $(React.findDOMNode(this.refs.loadmore)).text('Load more messages');
+                $(ReactDOM.findDOMNode(this.refs.loadmore)).text('Load more messages');
                 AsyncClient.dispatchError(err, 'getPosts');
             }.bind(this)
         );