IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-3.9' into merge-3.9

Browse Source
This commit is contained in:
JoramWilander
2017-05-12 08:00:28 -04:00
parent b1c39204a6 a21a06afd9
commit 9d109b0700
66 changed files with 799 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
webapp/utils/channel_utils.jsx
View File

@@ -5,6 +5,8 @@ const Preferences = Constants.Preferences;
import * as Utils from 'utils/utils.jsx';
import UserStore from 'stores/user_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import PreferenceStore from 'stores/preference_store.jsx';
import LocalizationStore from 'stores/localization_store.jsx';
@@ -251,6 +253,29 @@ export function buildGroupChannelName(channelId) {
return displayName;
}
export function getCountsStateFromStores(team = TeamStore.getCurrent(), teamMembers = TeamStore.getMyTeamMembers(), unreadCounts = ChannelStore.getUnreadCounts()) {
let mentionCount = 0;
let messageCount = 0;
teamMembers.forEach((member) => {
if (member.team_id !== TeamStore.getCurrentId()) {
mentionCount += (member.mention_count || 0);
messageCount += (member.msg_count || 0);
}
});
Object.keys(unreadCounts).forEach((chId) => {
const channel = ChannelStore.get(chId);
if (channel && (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL || channel.team_id === team.id)) {
messageCount += unreadCounts[chId].msgs;
mentionCount += unreadCounts[chId].mentions;
}
});
return {mentionCount, messageCount};
}
/*
* not exported helpers
*/

4
webapp/utils/utils.jsx
View File

@@ -558,13 +558,13 @@ export function applyTheme(theme) {
if (theme.mentionBj) {
changeCss('.sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'background:' + theme.mentionBj);
changeCss('.sidebar--left .badge', 'background:' + theme.mentionBj + ' !important');
changeCss('.app__body .sidebar--left .badge', 'background:' + theme.mentionBj);
changeCss('.multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'background:' + theme.mentionBj + ' !important');
}
if (theme.mentionColor) {
changeCss('.app__body .sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'color:' + theme.mentionColor);
changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor + ' !important');
changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor);
changeCss('.app__body .multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'color:' + theme.mentionColor + ' !important');
}