summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-10-15 10:57:09 -0400
committerJoramWilander <jwawilander@gmail.com>2015-10-16 11:48:55 -0400
commit20723437aa607abdfa0e9353927e8bf8694a6b2c (patch)
tree8d4d35d21b3890fadd40f8d10494e71bfb366a41
parent2b5ec4a3c076bb1f18eeafbd96b0a80c6b8bfbaa (diff)
downloadchat-20723437aa607abdfa0e9353927e8bf8694a6b2c.tar.gz
chat-20723437aa607abdfa0e9353927e8bf8694a6b2c.tar.bz2
chat-20723437aa607abdfa0e9353927e8bf8694a6b2c.zip
Fix typing socket constant
-rw-r--r--web/react/components/msg_typing.jsx4
-rw-r--r--web/react/utils/constants.jsx2
2 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx
index 216cbc7f0..1bd23c55c 100644
--- a/web/react/components/msg_typing.jsx
+++ b/web/react/components/msg_typing.jsx
@@ -37,8 +37,8 @@ export default class MsgTyping extends React.Component {
onChange(msg) {
if (msg.action === SocketEvents.TYPING &&
- this.props.channelId === msg.channel_id &&
- this.props.parentId === msg.props.parent_id) {
+ this.props.channelId === msg.channel_id &&
+ this.props.parentId === msg.props.parent_id) {
this.lastTime = new Date().getTime();
var username = 'Someone';
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index b2e9bc6a7..5eb8378ca 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -56,7 +56,7 @@ module.exports = {
NEW_USER: 'new_user',
USER_ADDED: 'user_added',
USER_REMOVED: 'user_removed',
- TYPING: 'user_typing'
+ TYPING: 'typing'
},
SPECIAL_MENTIONS: ['all', 'channel'],