IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4743 from tgxworld/fix_autocomplete_being_rerendered

Browse Source 
FIX: Category autocomplete breaks when search menu widget rerenders.
This commit is contained in:
Guo Xiang Tan 2017-03-10 09:42:18 +08:00 committed by GitHub
commit a43ec88f46
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/autocomplete.js.es6
View File

@ -261,7 +261,11 @@ export default function(options) {
left: "-1000px" left: "-1000px"
}); });
me.parent().append(div); if (options.appendSelector) {
me.parents(options.appendSelector).append(div);
} else {
me.parent().append(div);
}
if (!isInput && !options.treatAsTextarea) { if (!isInput && !options.treatAsTextarea) {
vOffset = div.height(); vOffset = div.height();

10
app/assets/javascripts/discourse/lib/search.js.es6
View File

@ -130,14 +130,14 @@ export function isValidSearchTerm(searchTerm) {
} }
}; };
export function applySearchAutocomplete($input, siteSettings, appEvents) { export function applySearchAutocomplete($input, siteSettings, appEvents, options) {
const afterComplete = function() { const afterComplete = function() {
if (appEvents) { if (appEvents) {
appEvents.trigger("search-autocomplete:after-complete"); appEvents.trigger("search-autocomplete:after-complete");
} }
}; };
$input.autocomplete({ $input.autocomplete(_.merge({
template: findRawTemplate('category-tag-autocomplete'), template: findRawTemplate('category-tag-autocomplete'),
key: '#', key: '#',
width: '100%', width: '100%',
@ -153,9 +153,9 @@ export function applySearchAutocomplete($input, siteSettings, appEvents) {
return searchCategoryTag(term, siteSettings); return searchCategoryTag(term, siteSettings);
}, },
afterComplete afterComplete
}); }, options));
$input.autocomplete({ $input.autocomplete(_.merge({
template: findRawTemplate('user-selector-autocomplete'), template: findRawTemplate('user-selector-autocomplete'),
key: "@", key: "@",
width: '100%', width: '100%',
@ -163,5 +163,5 @@ export function applySearchAutocomplete($input, siteSettings, appEvents) {
transformComplete: v => v.username || v.name, transformComplete: v => v.username || v.name,
dataSource: term => userSearch({ term, includeGroups: true }), dataSource: term => userSearch({ term, includeGroups: true }),
afterComplete afterComplete
}); }, options));
}; };

5
app/assets/javascripts/discourse/widgets/header.js.es6
View File

@ -262,7 +262,10 @@ export default createWidget('header', {
Ember.run.schedule('afterRender', () => { Ember.run.schedule('afterRender', () => {
const $searchInput = $('#search-term'); const $searchInput = $('#search-term');
$searchInput.focus().select(); $searchInput.focus().select();
applySearchAutocomplete($searchInput, this.siteSettings, this.appEvents);
applySearchAutocomplete($searchInput, this.siteSettings, this.appEvents, {
appendSelector: '.menu-panel'
});
}); });
} }
}, },