From 260ac5f4275c14dbedbecdbfe474e7202588be97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 30 Sep 2022 23:01:14 -0400 Subject: [PATCH] refactor: use avatar helper fix empty dropdown when searching --- public/src/client/chats/search.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/src/client/chats/search.js b/public/src/client/chats/search.js index 7a991f9c31..d5e7632793 100644 --- a/public/src/client/chats/search.js +++ b/public/src/client/chats/search.js @@ -1,7 +1,9 @@ 'use strict'; -define('forum/chats/search', ['components', 'api', 'alerts'], function (components, api, alerts) { +define('forum/chats/search', [ + 'components', 'api', 'alerts', 'helpers', +], function (components, api, alerts, helpers) { const search = {}; search.init = function () { @@ -11,7 +13,7 @@ define('forum/chats/search', ['components', 'api', 'alerts'], function (componen function doSearch() { const username = components.get('chat/search').val(); if (!username) { - return $('[component="chat/search/list"]').empty(); + return $('[component="chat/search/list"]').translateHtml('
  • [[admin/menu:search.start-typing]]
  • '); } api.get('/api/users', { @@ -31,7 +33,7 @@ define('forum/chats/search', ['components', 'api', 'alerts'], function (componen }); if (!data.users.length) { - return chatsListEl.translateHtml('
  • [[users:no-users-found]]
  • '); + return chatsListEl.translateHtml('
  • [[users:no-users-found]]
  • '); } data.users.forEach(function (userObj) { @@ -44,10 +46,8 @@ define('forum/chats/search', ['components', 'api', 'alerts'], function (componen function displayUser(chatsListEl, userObj) { function createUserImage() { - return (userObj.picture ? - '' : - '
    ' + userObj['icon:text'] + '
    ') + - ' ' + userObj.username; + const img = helpers.buildAvatar(userObj, '24px', true); + return `${img} ${userObj.username}`; } const chatEl = $('
  • ')