Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 07:26:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2397 from joe1chen/bug-fix-topic-search

Browse Source 
Bug fix - Topic search broken due to encodeURIComponent being called too early
This commit is contained in:
Barış Soner Uşaklı
2014-11-14 21:51:39 -05:00
parent 02fb81901d f02fd88eaf
commit 36ac6f849f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,17 +7,18 @@ define('search', ['navigator'], function(nav) {
}; };
Search.query = function(term, callback) { Search.query = function(term, callback) {
try {
term = encodeURIComponent(term);
} catch(e) {
return app.alertError('[[error:invalid-search-term]]');
}
// Detect if a tid was specified // Detect if a tid was specified
var topicSearch = term.match(/in:topic-([\d]+)/); var topicSearch = term.match(/in:topic-([\d]+)/);
if (!topicSearch) { if (!topicSearch) {
term = term.replace(/^[ ?#]*/, ''); term = term.replace(/^[ ?#]*/, '');
try {
term = encodeURIComponent(term);
} catch(e) {
return app.alertError('[[error:invalid-search-term]]');
}
ajaxify.go('search/' + term); ajaxify.go('search/' + term);
callback(); callback();
} else { } else {