Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-04 16:08:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: more merge/search fixes

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-06-10 15:11:57 -04:00
parent 066b442e18
commit 4b38533b15
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,26 +33,29 @@ define('search', ['navigator', 'translator', 'storage'], function (nav, translat
});
};
Search.quick = function (query, options, callback) {
Search.quick = function (options, callback) {
callback = callback || function () {};
var template = options.template || 'partials/quick-search-results';
$(window).trigger('action:search.quick.start', { data: query });
query.searchOnly = 1;
Search.api(query, function (data) {
$(window).trigger('action:search.quick.start', options);
options.searchOptions.searchOnly = 1;
Search.api(options.searchOptions, function (data) {
var resultEl = options.searchElements.resultEl;
if (options.hideOnNoMatches && !data.posts.length) {
return options.resultEl.addClass('hidden').find('#quick-search-results-container').html('');
return resultEl.addClass('hidden').find('.quick-search-results-container').html('');
}
data.posts.forEach(function (p) {
p.snippet = utils.escapeHTML($('<div>' + p.content + '</div>').text().slice(0, 80) + '...');
});
app.parseAndTranslate(template, data, function (html) {
app.parseAndTranslate('partials/quick-search-results', data, function (html) {
if (html.length) {
html.find('.timeago').timeago();
options.resultEl.removeClass('hidden').find('#quick-search-results-container').html(html);
resultEl.removeClass('hidden').find('.quick-search-results-container').html(html);
} else {
options.resultEl.addClass('hidden').find('#quick-search-results-container').html('');
resultEl.addClass('hidden').find('.quick-search-results-container').html('');
}
$(window).trigger('action:search.quick.complete', { data: data });
$(window).trigger('action:search.quick.complete', {
data: data,
options: options,
});
callback();
});
});