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

Merge branch 'autocomplete-search' of https://github.com/cpradio/discourse into autocomplete-search

This commit is contained in:
cpradio 2017-03-03 15:53:26 -05:00
parent e476614b6a 4c7a21c76e
commit e1bdc841ec
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
View File

@ -5,6 +5,11 @@ import { createWidget } from 'discourse/widgets/widget';
createWidget('search-term', {
tagName: 'input',
buildId: () => 'search-term',
buildKey: (attrs) => `search-term-${attrs.id}`,
defaultState() {
return { autocompleteIsOpen: false };
},
buildAttributes(attrs) {
return { type: 'text',
@ -12,8 +17,17 @@ createWidget('search-term', {
placeholder: attrs.contextEnabled ? "" : I18n.t('search.title') };
},
keyDown(e) {
const state = this.state;
if ($(`#${this.buildId()}`).parent().find('.autocomplete').length !== 0) {
state.autocompleteIsOpen = true;
} else {
state.autocompleteIsOpen = false;
}
},
keyUp(e) {
if (e.which === 13) {
if (e.which === 13 && !this.state.autocompleteIsOpen) {
return this.sendWidgetAction('fullSearch');
}