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

FIX: Retrigger search scoped to a topic if topic changes. 

https://meta.discourse.org/t/highlight-the-search-results/10322/12?u=tgxworld
This commit is contained in:
Guo Xiang Tan 2018-05-07 17:17:54 +08:00
parent b18e0825b5
commit 4f4c576311
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ export function initSearchData() {
searchData.term = undefined;
searchData.typeFilter = null;
searchData.invalidTerm = false;
searchData.topicId = null;
}
initSearchData();
@ -64,7 +65,11 @@ const SearchHelper = {
}
searchData.results = content;
widget.appEvents.trigger('post-stream:refresh', { force: true });
if (searchContext.type === 'topic') {
widget.appEvents.trigger('post-stream:refresh', { force: true });
searchData.topicId = searchContext.id;
}
}).finally(() => {
searchData.loading = false;
widget.scheduleRerender();
@ -164,11 +169,15 @@ export default createWidget('search-menu', {
},
html(attrs) {
if (searchData.contextEnabled !== attrs.contextEnabled) {
searchData.contextEnabled = attrs.contextEnabled;
if (searchData.term) this.triggerSearch();
} else {
searchData.contextEnabled = attrs.contextEnabled;
searchData.contextEnabled = attrs.contextEnabled;
const shouldTriggerSearch = (
(searchData.contextEnabled !== attrs.contextEnabled) ||
(this.searchContext().type === 'topic' && searchData.topicId !== this.searchContext().id)
);
if (shouldTriggerSearch && searchData.term) {
this.triggerSearch();
}
return this.attach('menu-panel', { maxWidth: 500, contents: () => this.panelContents() });