github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 16:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Reset advanced search options when search term is cleared.

Browse Source
This commit is contained in:
Guo Xiang Tan 2016-10-13 15:54:32 +08:00
parent 06cbabb4da
commit b16b2a6fbb
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/assets/javascripts/discourse/components/search-advanced-options.js.es6
View File

@ -18,8 +18,7 @@ const REGEXP_POST_TIME_WHEN = /(before|after)/ig;
export default Em.Component.extend({
classNames: ['search-advanced-options'],
searchedTerms: {username: [], category: null, group: [], badge: [], tags: [],
in: '', status: '', posts_count: '', time: {when: 'before', days: ''}},
inOptions: [
{name: I18n.t('search.advanced.filters.likes'), value: "likes"},
{name: I18n.t('search.advanced.filters.posted'), value: "posted"},
@ -47,18 +46,40 @@ export default Em.Component.extend({
init() {
this._super();
this._init();
this._update();
},
@observes('searchTerm')
_updateOptions() {
Ember.run.debounce(this, this._init, 250);
Ember.run.debounce(this, this._update, 250);
},
_init() {
this.setProperties({
searchedTerms: {
username: null,
category: null,
group: [],
badge: [],
tags: [],
in: '',
status: '',
posts_count: '',
time: {
when: 'before',
days: ''
}
}
})
},
_update() {
let searchTerm = this.get('searchTerm');
if (!searchTerm)
if (!searchTerm) {
this._init();
return;
}
this.findUsername(searchTerm);
this.findCategory(searchTerm);
@ -90,12 +111,14 @@ export default Em.Component.extend({
findUsername(searchTerm) {
const match = this.findSearchTerm(REGEXP_USERNAME_PREFIX, searchTerm);
if (match.length !== 0) {
let existingInput = _.isArray(this.get('searchedTerms.username')) ? this.get('searchedTerms.username')[0] : this.get('searchedTerms.username');
let userInput = match.replace(REGEXP_USERNAME_PREFIX, '');
if (userInput.length !== 0 && existingInput !== userInput)
this.set('searchedTerms.username', [userInput]);
} else
if (userInput.length !== 0 && this.get('searchedTerms.username') !== userInput) {
this.set('searchedTerms.username', userInput);
}
} else {
this.set('searchedTerms.username', []);
}
},
@observes('searchedTerms.username')

7
app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
View File

@ -2,7 +2,12 @@
<div class="control-group pull-left">
<label class="control-label" for="search-posted-by">{{i18n "search.advanced.posted_by.label"}}</label>
<div class="controls">
{{user-selector excludeCurrentUser=false usernames=searchedTerms.username class="user-selector" single="true" canReceiveUpdates="true"}}
{{user-selector
excludeCurrentUser=false
usernames=searchedTerms.username
class="user-selector"
single="true"
canReceiveUpdates="true"}}
</div>
</div>
<div class="control-group pull-left">