diff options
| author | David Lu <david.lu97@outlook.com> | 2016-10-11 09:06:12 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-10-11 09:06:12 -0400 |
| commit | 78a4b19fd7094b3b00fad1ee47d89e6e4e3cdb99 (patch) | |
| tree | f46499a14962fd588d79243c8cdb6cc568c0d90e /webapp/stores/channel_store.jsx | |
| parent | ae79fabf4bc40aed4777dc847fbe2719df0bb508 (diff) | |
| download | chat-78a4b19fd7094b3b00fad1ee47d89e6e4e3cdb99.tar.gz chat-78a4b19fd7094b3b00fad1ee47d89e6e4e3cdb99.tar.bz2 chat-78a4b19fd7094b3b00fad1ee47d89e6e4e3cdb99.zip | |
PLT-3785 Re-enabled marking messages unread (#4179)
* Re-added ALT+Click to mark msgs unread, fixed mentions for DM
* Added string to /shortcuts
Diffstat (limited to 'webapp/stores/channel_store.jsx')
| -rw-r--r-- | webapp/stores/channel_store.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx index f1cd0bf82..ec5ce7758 100644 --- a/webapp/stores/channel_store.jsx +++ b/webapp/stores/channel_store.jsx @@ -328,8 +328,9 @@ class ChannelStoreClass extends EventEmitter { let chMentionCount = chMember.mention_count; let chUnreadCount = ch.total_msg_count - chMember.msg_count; + // Temporary workaround for DM channels having wrong unread values if (ch.type === 'D') { - chMentionCount = chUnreadCount; + chMentionCount = 0; } else if (chMember.notify_props && chMember.notify_props.mark_unread === NotificationPrefs.MENTION) { chUnreadCount = 0; } |