From 44d4c2bc7c659c2dfb692eb1c3310afad34f1eff Mon Sep 17 00:00:00 2001 From: pichalite Date: Wed, 10 Feb 2016 06:16:48 -0800 Subject: [PATCH] hopefully I got everything right this time!! --- public/src/client/chats.js | 79 +++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 83a867516e..a85d527b0a 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -548,55 +548,54 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll', function doSearch() { var username = components.get('chat/search').val(); var chatsListEl = $('[component="chat/search/list"]'); - - if(username) { - socket.emit('user.search', { + + if (!username) { + return chatsListEl.empty(); + } + + socket.emit('user.search', { query: username, searchBy: 'username' - }, function(err, data) { - if (err) { - return app.alertError(err.message); - } + }, function(err, data) { + if (err) { + return app.alertError(err.message); + } - chatsListEl.empty(); + chatsListEl.empty(); - if (data.users.length === 0) { - chatsListEl.append('
  • No users found!
  • '); - } else { - data.users.forEach(function(userObj) { - function createUserImage() { - return (userObj.picture ? - '' : - '
    ' + userObj['icon:text'] + '
    ') + - ' ' + - userObj.username; - } + if (data.users.length === 0) { + chatsListEl.translateHtml('
  • [[users:no-users-found]]
  • '); + } else { + data.users.forEach(function(userObj) { + function createUserImage() { + return (userObj.picture ? + '' : + '
    ' + userObj['icon:text'] + '
    ') + + ' ' + userObj.username; + } - var chatEl = $('
  • ') - .attr('data-uid', userObj.uid) - .appendTo(chatsListEl); + var chatEl = $('
  • ') + .attr('data-uid', userObj.uid) + .appendTo(chatsListEl); - chatEl.append(createUserImage()); + chatEl.append(createUserImage()); - chatEl.click(function() { - socket.emit('modules.chats.hasPrivateChat', userObj.uid, function(err, roomId) { - if (err) { - return app.alertError(err.message); - } - if (roomId) { - ajaxify.go('chats/' + roomId); - } else { - app.newChat(userObj.uid); - } - }); - }); + chatEl.click(function() { + socket.emit('modules.chats.hasPrivateChat', userObj.uid, function(err, roomId) { + if (err) { + return app.alertError(err.message); + } + if (roomId) { + ajaxify.go('chats/' + roomId); + } else { + app.newChat(userObj.uid); + } + }); }); - } + }); + } - }); - } else { - chatsListEl.empty(); - } + }); } }; return Chats;