Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4415 from vinkas0/tweak-49070 

FIX: “Your search term is too short” message when no search term is entered at all
This commit is contained in:
Robin Ward 2016-08-26 14:02:42 -04:00 committed by GitHub
parent 6036770c0d f373e3ac8d
commit 58cb43884d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/widgets/search-menu.js.es6
View File

@ -97,13 +97,15 @@ export default createWidget('search-menu', {
const results = [this.attach('search-term', { value: searchData.term, contextEnabled }),
this.attach('search-context', { contextEnabled })];
if (searchData.loading) {
results.push(h('div.searching', h('div.spinner')));
} else {
results.push(this.attach('search-menu-results', { term: searchData.term,
noResults: searchData.noResults,
results: searchData.results,
invalidTerm: searchData.invalidTerm }));
if (searchData.term) {
if (searchData.loading) {
results.push(h('div.searching', h('div.spinner')));
} else {
results.push(this.attach('search-menu-results', { term: searchData.term,
noResults: searchData.noResults,
results: searchData.results,
invalidTerm: searchData.invalidTerm }));
}
}
return results;