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

FIX: Searching for spaces wouldn't stop spinning

This commit is contained in:
Robin Ward 2014-02-04 13:19:36 -05:00
parent abffcd9f94
commit 36683ff1e3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/controllers/search_controller.js
View File

@ -11,8 +11,8 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
// If we need to perform another search // If we need to perform another search
newSearchNeeded: function() { newSearchNeeded: function() {
this.set('noResults', false); this.set('noResults', false);
var term = this.get('term'); var term = (this.get('term') || '').trim();
if (term && term.length >= Discourse.SiteSettings.min_search_term_length) { if (term.length >= Discourse.SiteSettings.min_search_term_length) {
this.set('loading', true); this.set('loading', true);
this.searchTerm(term, this.get('typeFilter')); this.searchTerm(term, this.get('typeFilter'));
} else { } else {
@ -57,6 +57,8 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
self.set('urls', urls); self.set('urls', urls);
} }
self.set('loading', false);
}).catch(function() {
self.set('loading', false); self.set('loading', false);
}); });
}, 300), }, 300),