summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-10 17:49:23 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-10 17:49:23 -0400
commit27cab0f507d253bba5658335f42a4c7675fcdac7 (patch)
tree8bf831e0f517f9d73689e25631af46f6c37088dc
parent5bb2acc996dc037b15e5a2e1f27b29c87a6bb9b0 (diff)
parent78cc36fa9a35d6e35088b8215dabb9ee14869f95 (diff)
downloadchat-27cab0f507d253bba5658335f42a4c7675fcdac7.tar.gz
chat-27cab0f507d253bba5658335f42a4c7675fcdac7.tar.bz2
chat-27cab0f507d253bba5658335f42a4c7675fcdac7.zip
Merge pull request #165 from mattermost/revert-154-MM-831
Revert "MM-831 Post timestamp now updates in real time"
-rw-r--r--web/react/components/post_list.jsx5
-rw-r--r--web/react/components/sidebar_right.jsx6
2 files changed, 0 insertions, 11 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 177e4a1db..d6dc9ce30 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -78,7 +78,6 @@ module.exports = React.createClass({
PostStore.addChangeListener(this._onChange);
ChannelStore.addChangeListener(this._onChange);
- UserStore.addStatusesChangeListener(this._onChange);
SocketStore.addChangeListener(this._onSocketChange);
$(".post-list-holder-by-time").perfectScrollbar();
@@ -158,7 +157,6 @@ module.exports = React.createClass({
componentWillUnmount: function() {
PostStore.removeChangeListener(this._onChange);
ChannelStore.removeChangeListener(this._onChange);
- UserStore.removeStatusesChangeListener(this._onChange);
SocketStore.removeChangeListener(this._onSocketChange);
$('body').off('click.userpopover');
},
@@ -195,9 +193,6 @@ module.exports = React.createClass({
this.scrolledToNew = false;
}
this.setState(newState);
- } else {
- // Updates the timestamp on each post
- this.forceUpdate()
}
},
_onSocketChange: function(msg) {
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx
index 60c8ffae6..8334b345b 100644
--- a/web/react/components/sidebar_right.jsx
+++ b/web/react/components/sidebar_right.jsx
@@ -16,16 +16,10 @@ module.exports = React.createClass({
componentDidMount: function() {
PostStore.addSearchChangeListener(this._onSearchChange);
PostStore.addSelectedPostChangeListener(this._onSelectedChange);
- UserStore.addStatusesChangeListener(this._onChange);
},
componentWillUnmount: function() {
PostStore.removeSearchChangeListener(this._onSearchChange);
PostStore.removeSelectedPostChangeListener(this._onSelectedChange);
- UserStore.removeStatusesChangeListener(this._onChange);
- },
- _onChange: function() {
- // Updates the timestamp on each post
- this.forceUpdate();
},
_onSelectedChange: function(from_search) {
if (this.isMounted()) {