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

Merge branch 'master' of https://github.com/discourse/discourse

This commit is contained in:
Jeff Atwood 2015-09-16 17:16:20 -07:00
parent 4714483612 975837cf0d
commit 2ac9f6a1b0
3 changed files with 11 additions and 14 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: [], selected: [],
context_id: null, context_id: null,
context: null, context: null,
searching: false,
@computed('q') @computed('q')
hasAutofocus(q) { hasAutofocus(q) {
@ -45,9 +46,9 @@ export default Ember.Controller.extend({
return isValidSearchTerm(q); return isValidSearchTerm(q);
}, },
@computed('searchTerm') @computed('searchTerm', 'searching')
isNotValidSearchTerm(searchTerm) { searchButtonDisabled(searchTerm, searching) {
return !isValidSearchTerm(searchTerm); return !!(searching || !isValidSearchTerm(searchTerm));
}, },
@observes('model') @observes('model')
@ -74,10 +75,8 @@ export default Ember.Controller.extend({
canBulkSelect: Em.computed.alias('currentUser.staff'), canBulkSelect: Em.computed.alias('currentUser.staff'),
search(){ search(){
if (this._searching) { if (this.get("searching")) return;
return; this.set("searching", true);
}
this._searching = true;
const router = Discourse.__container__.lookup('router:main'); const router = Discourse.__container__.lookup('router:main');
@ -100,7 +99,7 @@ export default Ember.Controller.extend({
const model = translateResults(results) || {}; const model = translateResults(results) || {};
router.transientCache('lastSearch', { searchKey, model }, 5); router.transientCache('lastSearch', { searchKey, model }, 5);
this.set("model", model); this.set("model", model);
}).finally(() => this._searching = false); }).finally(() => { this.set("searching",false); });
}, },
actions: { actions: {
@ -139,7 +138,7 @@ export default Ember.Controller.extend({
}, },
search() { search() {
if (this.get("isNotValidSearchTerm")) return; if (this.get("searchButtonDisabled")) return;
this.search(); this.search();
} }
} }

6
app/assets/javascripts/discourse/lib/screen-track.js.es6
View File

@ -137,7 +137,7 @@ const ScreenTrack = Ember.Object.extend({
controller.readPosts(topicId, postNumbers); controller.readPosts(topicId, postNumbers);
} }
}); });
} else { } else if (this.get('anonFlushCallback')) {
// Anonymous viewer - save to localStorage // Anonymous viewer - save to localStorage
const storage = this.get('keyValueStore'); const storage = this.get('keyValueStore');
@ -158,9 +158,7 @@ const ScreenTrack = Ember.Object.extend({
} }
// Inform the observer // Inform the observer
if (this.get('anonFlushCallback')) { this.get('anonFlushCallback')();
this.get('anonFlushCallback')();
}
// No need to call controller.readPosts() // No need to call controller.readPosts()
} }

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

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