hopefully I got everything right this time!!

v1.18.x
pichalite 9 years ago
parent 2723800628
commit 44d4c2bc7c

@ -548,55 +548,54 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
function doSearch() { function doSearch() {
var username = components.get('chat/search').val(); var username = components.get('chat/search').val();
var chatsListEl = $('[component="chat/search/list"]'); var chatsListEl = $('[component="chat/search/list"]');
if(username) { if (!username) {
socket.emit('user.search', { return chatsListEl.empty();
}
socket.emit('user.search', {
query: username, query: username,
searchBy: 'username' searchBy: 'username'
}, function(err, data) { }, function(err, data) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
chatsListEl.empty(); chatsListEl.empty();
if (data.users.length === 0) { if (data.users.length === 0) {
chatsListEl.append('<li><div><span>No users found!</span></div></li>'); chatsListEl.translateHtml('<li><div><span>[[users:no-users-found]]</span></div></li>');
} else { } else {
data.users.forEach(function(userObj) { data.users.forEach(function(userObj) {
function createUserImage() { function createUserImage() {
return (userObj.picture ? return (userObj.picture ?
'<img src="' + userObj.picture + '" title="' + userObj.username +'" />' : '<img src="' + userObj.picture + '" title="' + userObj.username +'" />' :
'<div class="user-icon" style="background-color: ' + userObj['icon:bgColor'] + '">' + userObj['icon:text'] + '</div>') + '<div class="user-icon" style="background-color: ' + userObj['icon:bgColor'] + '">' + userObj['icon:text'] + '</div>') +
'<i class="fa fa-circle status ' + userObj.status + '"></i> ' + '<i class="fa fa-circle status ' + userObj.status + '"></i> ' + userObj.username;
userObj.username; }
}
var chatEl = $('<li component="chat/search/user" />') var chatEl = $('<li component="chat/search/user" />')
.attr('data-uid', userObj.uid) .attr('data-uid', userObj.uid)
.appendTo(chatsListEl); .appendTo(chatsListEl);
chatEl.append(createUserImage()); chatEl.append(createUserImage());
chatEl.click(function() { chatEl.click(function() {
socket.emit('modules.chats.hasPrivateChat', userObj.uid, function(err, roomId) { socket.emit('modules.chats.hasPrivateChat', userObj.uid, function(err, roomId) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
if (roomId) { if (roomId) {
ajaxify.go('chats/' + roomId); ajaxify.go('chats/' + roomId);
} else { } else {
app.newChat(userObj.uid); app.newChat(userObj.uid);
} }
}); });
});
}); });
} });
}
}); });
} else {
chatsListEl.empty();
}
} }
}; };
return Chats; return Chats;

Loading…
Cancel
Save