codeninjasllc/discourse
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request from vinkas0/tweak-49070

Browse source 
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
commit 58cb43884d
1 changed files with 9 additions and 7 deletions

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 }), const results = [this.attach('search-term', { value: searchData.term, contextEnabled }),
this.attach('search-context', { contextEnabled })]; this.attach('search-context', { contextEnabled })];
if (searchData.loading) { if (searchData.term) {
results.push(h('div.searching', h('div.spinner'))); if (searchData.loading) {
} else { results.push(h('div.searching', h('div.spinner')));
results.push(this.attach('search-menu-results', { term: searchData.term, } else {
noResults: searchData.noResults, results.push(this.attach('search-menu-results', { term: searchData.term,
results: searchData.results, noResults: searchData.noResults,
invalidTerm: searchData.invalidTerm })); results: searchData.results,
invalidTerm: searchData.invalidTerm }));
}
} }
return results; return results;