summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/react/components/msg_typing.jsx18
-rw-r--r--web/react/stores/channel_store.jsx11
2 files changed, 9 insertions, 20 deletions
diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx
index 089412229..a6953028f 100644
--- a/web/react/components/msg_typing.jsx
+++ b/web/react/components/msg_typing.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
// See License.txt for license information.
-var ChannelStore = require('../stores/channel_store.jsx');
+
var SocketStore = require('../stores/socket_store.jsx');
var UserStore = require('../stores/user_store.jsx');
@@ -9,17 +9,17 @@ module.exports = React.createClass({
timer: null,
lastTime: 0,
componentDidMount: function() {
- ChannelStore.addDiffChannelChangeListener(this._onChange);
- SocketStore.addChangeListener(this._onSocketChange);
+ SocketStore.addChangeListener(this._onChange);
},
- componentWillUnmount: function() {
- ChannelStore.removeDiffChannelChangeListener(this._onChange);
- SocketStore.removeChangeListener(this._onSocketChange);
+ componentWillReceiveProps: function(newProps) {
+ if(this.props.channelId !== newProps.channelId) {
+ this.setState({text:""});
+ }
},
- _onChange: function() {
- this.setState({text:""})
+ componentWillUnmount: function() {
+ SocketStore.removeChangeListener(this._onChange);
},
- _onSocketChange: function(msg) {
+ _onChange: function(msg) {
if (msg.action == "typing" &&
this.props.channelId == msg.channel_id &&
this.props.parentId == msg.props.parent_id) {
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index 4e52cccd3..3f259bc7d 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -12,7 +12,6 @@ var ActionTypes = Constants.ActionTypes;
var CHANGE_EVENT = 'change';
var MORE_CHANGE_EVENT = 'change';
var EXTRA_INFO_EVENT = 'extra_info';
-var DIFF_CHANNEL_EVENT = 'change_channel';
var ChannelStore = assign({}, EventEmitter.prototype, {
emitChange: function() {
@@ -24,15 +23,6 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
removeChangeListener: function(callback) {
this.removeListener(CHANGE_EVENT, callback);
},
- emitDiffChannelChange: function() {
- this.emit(DIFF_CHANNEL_EVENT);
- },
- addDiffChannelChangeListener: function(callback) {
- this.on(DIFF_CHANNEL_EVENT,callback);
- },
- removeDiffChannelChangeListener: function(callback) {
- this.removeListener(DIFF_CHANNEL_EVENT,callback);
- },
emitMoreChange: function() {
this.emit(MORE_CHANGE_EVENT);
},
@@ -235,7 +225,6 @@ ChannelStore.dispatchToken = AppDispatcher.register(function(payload) {
ChannelStore.setCurrentId(action.id);
ChannelStore.setLastVisitedName(action.name);
ChannelStore.resetCounts(action.id);
- ChannelStore.emitDiffChannelChange();
ChannelStore.emitChange();
break;