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 #3769 from tgxworld/disable_button_while_searching 

UX: Disable button while searching.
This commit is contained in:
Sam 2015-09-17 10:01:27 +10:00
parent b0f0a9e750 5d95b38c65
commit 975837cf0d
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/discourse/controllers/full-page-search.js.es6
View File

@ -12,6 +12,7 @@ export default Ember.Controller.extend({
selected: [],
context_id: null,
context: null,
searching: false,
@computed('q')
hasAutofocus(q) {
@ -45,9 +46,9 @@ export default Ember.Controller.extend({
return isValidSearchTerm(q);
},
@computed('searchTerm')
isNotValidSearchTerm(searchTerm) {
return !isValidSearchTerm(searchTerm);
@computed('searchTerm', 'searching')
searchButtonDisabled(searchTerm, searching) {
return !!(searching || !isValidSearchTerm(searchTerm));
},
@observes('model')
@ -74,10 +75,8 @@ export default Ember.Controller.extend({
canBulkSelect: Em.computed.alias('currentUser.staff'),
search(){
if (this._searching) {
return;
}
this._searching = true;
if (this.get("searching")) return;
this.set("searching", true);
const router = Discourse.__container__.lookup('router:main');
@ -100,7 +99,7 @@ export default Ember.Controller.extend({
const model = translateResults(results) || {};
router.transientCache('lastSearch', { searchKey, model }, 5);
this.set("model", model);
}).finally(() => this._searching = false);
}).finally(() => { this.set("searching",false); });
},
actions: {
@ -139,7 +138,7 @@ export default Ember.Controller.extend({
},
search() {
if (this.get("isNotValidSearchTerm")) return;
if (this.get("searchButtonDisabled")) return;
this.search();
}
}

2
app/assets/javascripts/discourse/templates/full-page-search.hbs
View File

@ -1,6 +1,6 @@
<div class="search row clearfix">
{{search-text-field value=searchTerm class="input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
{{d-button action="search" icon="search" class="btn-primary" disabled=isNotValidSearchTerm}}
{{d-button action="search" icon="search" class="btn-primary" disabled=searchButtonDisabled}}
{{#if canBulkSelect}}
{{#if model.posts}}
{{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}