From ebe5ed22bb4d6adbb4ef64c0cbfc861b86e5f4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Sep 2019 18:52:03 -0400 Subject: [PATCH] feat: make handleSearch public --- public/src/client/users.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index b0d8646da6..8ff3f1cea0 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -5,6 +5,7 @@ define('forum/users', ['translator', 'benchpress'], function (translator, Benchp var Users = {}; var searchTimeoutID = 0; + var searchResultCount = 0; $(window).on('action:ajaxify.start', function () { if (searchTimeoutID) { @@ -20,7 +21,7 @@ define('forum/users', ['translator', 'benchpress'], function (translator, Benchp $('.nav-pills li').removeClass('active').find('a[href="' + window.location.pathname + section + '"]').parent() .addClass('active'); - handleSearch(); + Users.handleSearch(); handleInvite(); @@ -28,7 +29,8 @@ define('forum/users', ['translator', 'benchpress'], function (translator, Benchp socket.on('event:user_status_change', onUserStatusChange); }; - function handleSearch() { + Users.handleSearch = function (params) { + searchResultCount = params && params.resultCount; searchTimeoutID = 0; $('#search-user').on('keyup', function () { @@ -43,7 +45,7 @@ define('forum/users', ['translator', 'benchpress'], function (translator, Benchp $('.search select, .search input[type="checkbox"]').on('change', function () { doSearch(); }); - } + }; function doSearch() { $('[component="user/search/icon"]').removeClass('fa-search').addClass('fa-spinner fa-spin'); @@ -103,6 +105,10 @@ define('forum/users', ['translator', 'benchpress'], function (translator, Benchp $('.pagination-container').replaceWith(html); }); + if (searchResultCount) { + data.users = data.users.slice(0, searchResultCount); + } + Benchpress.parse('users', 'users', data, function (html) { translator.translate(html, function (translated) { translated = $(translated);