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

Fix broken JS specs.

This commit is contained in:
Guo Xiang Tan 2018-05-07 17:48:25 +08:00
parent fc4fde453d
commit 0042d94f76
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ const SearchHelper = {
searchData.results = content;
if (searchContext.type === 'topic') {
if (searchContext && searchContext.type === 'topic') {
widget.appEvents.trigger('post-stream:refresh', { force: true });
searchData.topicId = searchContext.id;
}
@ -170,10 +170,15 @@ export default createWidget('search-menu', {
html(attrs) {
searchData.contextEnabled = attrs.contextEnabled;
const searchContext = this.searchContext();
const shouldTriggerSearch = (
(searchData.contextEnabled !== attrs.contextEnabled) ||
(this.searchContext().type === 'topic' && searchData.topicId !== this.searchContext().id)
(searchContext &&
searchContext.type === 'topic' &&
searchData.topicId !== null &&
searchData.topicId !== searchContext.id
)
);
if (shouldTriggerSearch && searchData.term) {