Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-11 07:00:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

breaking: use components instead of ids for search

Browse Source 
breaking: remove deprecated app.search methods
allow having multiple search forms in the page
This commit is contained in:
Barış Soner Uşaklı
2022-09-28 12:01:31 -04:00
parent 092bdd9f22
commit 58cecafb34
3 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/src/app.js
View File

@@ -287,28 +287,6 @@ if (document.readyState === 'loading') {
});
};
app.enableTopicSearch = function (options) {
console.warn('[deprecated] app.enableTopicSearch is deprecated, please use search.enableQuickSearch(options)');
require(['search'], function (search) {
search.enableQuickSearch(options);
});
};
app.handleSearch = function (searchOptions) {
console.warn('[deprecated] app.handleSearch is deprecated, please use search.init(options)');
require(['search'], function (search) {
search.init(searchOptions);
});
};
app.prepareSearch = function () {
console.warn('[deprecated] app.prepareSearch is deprecated, please use search.showAndFocusInput()');
require(['search'], function (search) {
search.showAndFocusInput();
});
};
app.updateUserStatus = function (el, status) {
if (!el.length) {
return;

2
public/src/client/topic.js
View File

@@ -78,7 +78,7 @@ define('forum/topic', [
require(['search'], function (search) {
mousetrap.bind(['command+f', 'ctrl+f'], function (e) {
e.preventDefault();
$('#search-fields input').val('in:topic-' + ajaxify.data.tid + ' ');
$('[component="search/fields"] input[name="query"]').val('in:topic-' + ajaxify.data.tid + ' ');
search.showAndFocusInput();
});

37
public/src/modules/search.js
View File

@@ -11,18 +11,22 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
}
searchOptions = searchOptions || { in: config.searchDefaultInQuick || 'titles' };
const searchButton = $('#search-button');
const searchFields = $('#search-fields');
const searchInput = $('#search-fields input');
const quickSearchContainer = $('#quick-search-container');
const toggleVisibility = searchFields.is(':hidden');
$('#search-form .advanced-search-link').off('mousedown').on('mousedown', function () {
ajaxify.go('/search');
const searchForm = $('[component="search/form"]');
searchForm.each((index, form) => {
init($(form), searchOptions);
});
};
$('#search-form').off('submit').on('submit', function () {
searchInput.blur();
function init(searchForm, searchOptions) {
const searchButton = searchForm.find('[component="search/button"]');
const searchFields = searchForm.find('[component="search/fields"]');
const searchInput = searchFields.find('input[name="query"]');
const quickSearchContainer = searchFields.find('#quick-search-container');
const toggleVisibility = searchFields.hasClass('hidden');
searchForm.find('.advanced-search-link').off('mousedown').on('mousedown', function () {
ajaxify.go('/search');
});
if (toggleVisibility) {
@@ -63,8 +67,8 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
return false;
});
$('#search-form').off('submit').on('submit', function () {
const input = $(this).find('input');
searchForm.off('submit').on('submit', function () {
const input = $(this).find('input[name="query"]');
const data = Search.getSearchPreferences();
data.term = input.val();
data.in = searchOptions.in;
@@ -74,11 +78,12 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
});
Search.query(data, function () {
input.val('');
searchInput.trigger('blur');
});
return false;
});
};
}
Search.enableQuickSearch = function (options) {
if (!config.searchEnabled || !app.user.privileges['search:content']) {
@@ -217,9 +222,9 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
};
Search.showAndFocusInput = function () {
$('#search-fields').removeClass('hidden');
$('#search-button').addClass('hidden');
$('#search-fields input').focus();
$('[component="search/fields"]').removeClass('hidden');
$('[component="search/button]').addClass('hidden');
$('[component="search/fields"] input[name="query"]').trigger('focus');
};
Search.query = function (data, callback) {