diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-22 19:19:27 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-22 19:19:27 -0800 |
commit | dc79707787b521ea5fc0d9088ccd9069780c8e0c (patch) | |
tree | 2f37a2aa6aa897fac5c5045d513eb1a69c818f6e /web/react/stores | |
parent | 37c8193dceb37dc6bd2d38b50fdbe0b4647bff2f (diff) | |
parent | 8476062d214230e2370af87a9495457c7a5a2a6d (diff) | |
download | chat-dc79707787b521ea5fc0d9088ccd9069780c8e0c.tar.gz chat-dc79707787b521ea5fc0d9088ccd9069780c8e0c.tar.bz2 chat-dc79707787b521ea5fc0d9088ccd9069780c8e0c.zip |
Merge pull request #194 from ralder/fix-command-box-css
[webui] fix command-list css
Diffstat (limited to 'web/react/stores')
-rw-r--r-- | web/react/stores/user_store.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index d03016c5d..001162f47 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -183,6 +183,9 @@ var UserStore = assign({}, EventEmitter.prototype, { var keys = []; + if (!user) + return keys; + if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(',')); if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name); if (user.notify_props.all === "true") keys.push('@all'); @@ -258,4 +261,3 @@ UserStore.dispatchToken = AppDispatcher.register(function(payload) { UserStore.setMaxListeners(0); global.window.UserStore = UserStore; module.exports = UserStore; - |