summaryrefslogtreecommitdiffstats
path: root/web/react/stores
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-30 09:06:10 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-30 09:06:10 -0400
commitf030476ff5f438b96d7282c37ad7a42ffc61ae85 (patch)
tree9e78f0cc7aece10d5716f6130722896934a4bc65 /web/react/stores
parent495b0e45235b646e7bb6aedf53004ee359b6887f (diff)
downloadchat-f030476ff5f438b96d7282c37ad7a42ffc61ae85.tar.gz
chat-f030476ff5f438b96d7282c37ad7a42ffc61ae85.tar.bz2
chat-f030476ff5f438b96d7282c37ad7a42ffc61ae85.zip
@all and @channel now highlight like other mentions
Diffstat (limited to 'web/react/stores')
-rw-r--r--web/react/stores/user_store.jsx3
1 files changed, 3 insertions, 0 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index bbca92c84..e1df4879f 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -240,6 +240,9 @@ var UserStore = assign({}, EventEmitter.prototype, {
if (first.length > 0) keys.push(first);
}
+ if (user.notify_props.all === "true") keys.push('@all');
+ if (user.notify_props.channel === "true") keys.push('@channel');
+
return keys;
} else {
return [];