Skip to content

Node.js based forum software built for the modern web

refactor: load searchDict if user focuses search input

Barış Soner Uşaklıe5f1cbfa7d09
diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js
index 44394afbdf..e674feba64 100644
--- a/public/src/admin/modules/search.js
+++ b/public/src/admin/modules/search.js
@@ -3,6 +3,8 @@
define('admin/modules/search', ['mousetrap', 'alerts'], function (mousetrap, alerts) {
const search = {};
+ let dict;
+
function find(dict, term) {
const html = dict.filter(function (elem) {
return elem.translations.toLowerCase().includes(term);
@@ -49,24 +51,26 @@ define('admin/modules/search', ['mousetrap', 'alerts'], function (mousetrap, ale
if (!app.user.privileges['admin:settings']) {
return;
}
-
- socket.emit('admin.getSearchDict', {}, function (err, dict) {
- if (err) {
- alerts.error(err);
- throw err;
- }
- setupACPSearch(dict);
- });
+ setupACPSearch();
};
- function setupACPSearch(dict) {
+ function setupACPSearch() {
const searchEls = $('[component="acp/search"]');
searchEls.each((index, searchEl) => {
- setupSearch(dict, $(searchEl));
+ setupSearch($(searchEl));
});
}
- function setupSearch(dict, searchEl) {
+ async function lazyLoadDict() {
+ try {
+ dict = dict || await socket.emit('admin.getSearchDict', {});
+ } catch (err) {
+ alerts.error(err);
+ dict = [];
+ }
+ }
+
+ function setupSearch(searchEl) {
const dropdown = searchEl.find('.dropdown');
const menu = searchEl.find('.dropdown-menu');
const input = searchEl.find('input');
@@ -74,7 +78,7 @@ define('admin/modules/search', ['mousetrap', 'alerts'], function (mousetrap, ale
if (!config.searchEnabled) {
menu.addClass('search-disabled');
}
-
+ input.on('focus', lazyLoadDict);
input.on('keyup', function () {
dropdown.addClass('open');
});