Added feature to the 'More...' PM channel list and fixed small cosmetic issues
Этот коммит содержится в:
@@ -438,7 +438,7 @@ module.exports.createChannel = function(channel, success, error) {
|
||||
module.exports.track('api', 'api_channels_create', channel.type, 'name', channel.name);
|
||||
};
|
||||
|
||||
module.exports.createPMChannelIfNotExists = function(channel, userId, success, error) {
|
||||
module.exports.createDirectChannel = function(channel, userId, success, error) {
|
||||
$.ajax({
|
||||
url: '/api/v1/channels/create_direct',
|
||||
dataType: 'json',
|
||||
@@ -447,7 +447,7 @@ module.exports.createPMChannelIfNotExists = function(channel, userId, success, e
|
||||
data: JSON.stringify({user_id: userId}),
|
||||
success: success,
|
||||
error: function(xhr, status, err) {
|
||||
var e = handleError('createPMIfNotExists', xhr, status, err);
|
||||
var e = handleError('createDirectChannel', xhr, status, err);
|
||||
error(e);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -964,4 +964,17 @@ module.exports.generateId = function() {
|
||||
|
||||
module.exports.isBrowserFirefox = function() {
|
||||
return navigator && navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
|
||||
}
|
||||
};
|
||||
|
||||
// Used to get the id of the other user from a DM channel
|
||||
module.exports.getUserIdFromChannelName = function(channel) {
|
||||
var ids = channel.name.split('__');
|
||||
var otherUserId = '';
|
||||
if (ids[0] === UserStore.getCurrentId()) {
|
||||
otherUserId = ids[1];
|
||||
} else {
|
||||
otherUserId = ids[0];
|
||||
}
|
||||
|
||||
return otherUserId;
|
||||
};
|
||||
|
||||
Ссылка в новой задаче
Block a user