Renamed show_hide preference to show
Этот коммит содержится в:
@@ -3,6 +3,7 @@
|
||||
|
||||
var TeamStore = require('../stores/team_store.jsx');
|
||||
var Client = require('../utils/client.jsx');
|
||||
var Constants = require('../utils/constants.jsx');
|
||||
var AsyncClient = require('../utils/async_client.jsx');
|
||||
var PreferenceStore = require('../stores/preference_store.jsx');
|
||||
var utils = require('../utils/utils.jsx');
|
||||
@@ -23,7 +24,8 @@ export default class MoreDirectChannels extends React.Component {
|
||||
}
|
||||
|
||||
handleJoinDirectChannel(channel) {
|
||||
const preference = PreferenceStore.setPreferenceWithAltId('direct_channels', 'show_hide', channel.teammate_id, 'true');
|
||||
const preference = PreferenceStore.setPreferenceWithAltId(Constants.Preferences.CATEGORY_DIRECT_CHANNELS,
|
||||
Constants.Preferences.NAME_SHOW, channel.teammate_id, 'true');
|
||||
AsyncClient.setPreferences([preference]);
|
||||
}
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ export default class Sidebar extends React.Component {
|
||||
teammates.push(teamMemberMap[id]);
|
||||
}
|
||||
|
||||
const preferences = PreferenceStore.getPreferences('direct_channels', 'show_hide');
|
||||
const preferences = PreferenceStore.getPreferences(Constants.Preferences.CATEGORY_DIRECT_CHANNELS, Constants.Preferences.NAME_SHOW);
|
||||
|
||||
// Create lists of all read and unread direct channels
|
||||
var visibleDirectChannels = [];
|
||||
@@ -96,7 +96,8 @@ export default class Sidebar extends React.Component {
|
||||
visibleDirectChannels.push(channel);
|
||||
} else if (forceShow) {
|
||||
// make sure that unread direct channels are visible
|
||||
const preference = PreferenceStore.setPreferenceWithAltId('direct_channels', 'show_hide', teammate.id, 'true');
|
||||
const preference = PreferenceStore.setPreferenceWithAltId(Constants.Preferences.CATEGORY_DIRECT_CHANNELS,
|
||||
Constants.Preferences.NAME_SHOW, teammate.id, 'true');
|
||||
AsyncClient.setPreferences([preference]);
|
||||
|
||||
visibleDirectChannels.push(channel);
|
||||
@@ -306,7 +307,8 @@ export default class Sidebar extends React.Component {
|
||||
if (!channel.leaving) {
|
||||
channel.leaving = true;
|
||||
|
||||
const preference = PreferenceStore.setPreferenceWithAltId('direct_channels', 'show_hide', channel.teammate_id, 'false');
|
||||
const preference = PreferenceStore.setPreferenceWithAltId(Constants.Preferences.CATEGORY_DIRECT_CHANNELS,
|
||||
Constants.Preferences.NAME_SHOW, channel.teammate_id, 'false');
|
||||
AsyncClient.setPreferences(
|
||||
[preference],
|
||||
() => {
|
||||
|
||||
@@ -645,8 +645,8 @@ export function getDirectChannels() {
|
||||
|
||||
callTracker.getDirectChannels = utils.getTimestamp();
|
||||
client.getPreferencesByName(
|
||||
'direct_channels',
|
||||
'show_hide',
|
||||
Constants.Preferences.CATEGORY_DIRECT_CHANNELS,
|
||||
Constants.Preferences.NAME_SHOW,
|
||||
(data, textStatus, xhr) => {
|
||||
callTracker.getDirectChannels = 0;
|
||||
|
||||
|
||||
@@ -286,5 +286,9 @@ module.exports = {
|
||||
id: 'mentionHighlightLink',
|
||||
uiName: 'Mention Highlight Link'
|
||||
}
|
||||
]
|
||||
],
|
||||
Preferences: {
|
||||
CATEGORY_DIRECT_CHANNELS: 'direct_channels',
|
||||
NAME_SHOW: 'show'
|
||||
}
|
||||
};
|
||||
|
||||
Ссылка в новой задаче
Block a user