Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-28 02:09:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6771

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-09-18 18:08:46 -04:00
parent dff86b1ac9
commit d880a7ade0
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/client/search.js
View File

@@ -138,7 +138,7 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
if (!searchQuery) {
return;
}
searchQuery = utils.escapeHTML(searchQuery);
var regexStr = searchQuery.replace(/^"/, '').replace(/"$/, '').trim().split(' ').join('|');
var regex = new RegExp('(' + regexStr + ')', 'gi');
@@ -151,11 +151,15 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
nested.push($('<div />').append($(this)));
});
result.html(result.html().replace(regex, '<strong>$1</strong>'));
result.html(result.html().replace(regex, function (match, p1) {
return '<strong>' + p1 + '</strong>';
}));
for (var i = 0, ii = nested.length; i < ii; i += 1) {
result.html(result.html().replace('<!-- ' + i + ' -->', nested[i].html()));
}
nested.forEach(function (nestedEl, i) {
result.html(result.html().replace('<!-- ' + i + ' -->', function () {
return nestedEl.html();
}));
});
});
$('.search-result-text').find('img:not(.not-responsive)').addClass('img-responsive');

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

@@ -7,24 +7,14 @@ define('search', ['navigator', 'translator', 'storage'], function (nav, translat
};
Search.query = function (data, callback) {
var term = data.term;
// Detect if a tid was specified
var topicSearch = term.match(/^in:topic-([\d]+) /);
var topicSearch = data.term.match(/^in:topic-([\d]+) /);
if (!topicSearch) {
term = term.replace(/^[ ?#]*/, '');
try {
term = encodeURIComponent(term);
} catch (e) {
return app.alertError('[[error:invalid-search-term]]');
}
ajaxify.go('search?' + createQueryString(data));
callback();
} else {
var cleanedTerm = term.replace(topicSearch[0], '');
var cleanedTerm = data.term.replace(topicSearch[0], '');
var tid = topicSearch[1];
if (cleanedTerm.length > 0) {
@@ -36,8 +26,15 @@ define('search', ['navigator', 'translator', 'storage'], function (nav, translat
function createQueryString(data) {
var searchIn = data.in || 'titlesposts';
var postedBy = data.by || '';
var term = data.term.replace(/^[ ?#]*/, '');
try {
term = encodeURIComponent(term);
} catch (e) {
return app.alertError('[[error:invalid-search-term]]');
}
var query = {
term: data.term,
term: term,
in: searchIn,
};