diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-19 12:19:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 12:19:04 -0400 |
| commit | 04cd7b1a89f63f10265e0dcfc95b6f67f164cf75 (patch) | |
| tree | 921a1fd1488dc972102ba577a7cdeeb8962c07dd /webapp/stores | |
| parent | c998fd4f52ba1d03e8fc0d7b39ced5202ce35dfc (diff) | |
| download | chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.tar.gz chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.tar.bz2 chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.zip | |
Merge 3.9 RC5 fixes into master (#6459)
* UI fixes for 3.9 (#6400)
* UI fixes for header icon alignment
* PLT-6569 - Fixing pin icon in header
* PLT-6505 - Updating z-index for emoji picker
* Updating z-index for overlaying sidebar
* PLT-6134 - Fix for emoji picker on comments
* Reverting emoji picker fix
* Fixing alignment for header icons
* Removing channel title changes
* Don't show mention badge for active channel (#6411)
* PLT-6583 - Fixing RHS compact view (#6413)
Diffstat (limited to 'webapp/stores')
| -rw-r--r-- | webapp/stores/channel_store.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx index 58a7dfb78..07513aade 100644 --- a/webapp/stores/channel_store.jsx +++ b/webapp/stores/channel_store.jsx @@ -560,7 +560,9 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => { var markRead = id === ChannelStore.getCurrentId() && window.isActive; if (TeamStore.getCurrentId() === teamId || teamId === '') { - ChannelStore.incrementMentionsIfNeeded(id, action.websocketMessageProps); + if (!markRead) { + ChannelStore.incrementMentionsIfNeeded(id, action.websocketMessageProps); + } ChannelStore.incrementMessages(id, markRead); } break; |