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

FIX: ensures search-menu is not briefly showing previous results (#9272)

This commit is contained in:
Joffrey JAFFEUX 2020-03-25 10:00:48 +01:00 committed by GitHub
parent 70012f2027
commit cff9d4726c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import { get } from "@ember/object"; import { get } from "@ember/object";
import { debounce, cancel } from "@ember/runloop"; import { debounce } from "@ember/runloop";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { searchForTerm, isValidSearchTerm } from "discourse/lib/search"; import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
import { createWidget } from "discourse/widgets/widget"; import { createWidget } from "discourse/widgets/widget";
@ -27,7 +27,7 @@ const SearchHelper = {
// for cancelling debounced search // for cancelling debounced search
cancel() { cancel() {
if (this._activeSearch) { if (this._activeSearch) {
cancel(this._activeSearch); this._activeSearch.abort();
this._activeSearch = null; this._activeSearch = null;
} }
}, },
@ -55,21 +55,24 @@ const SearchHelper = {
}); });
this._activeSearch this._activeSearch
.then(content => { .then(content => {
searchData.noResults = content.resultTypes.length === 0; // we ensure the current search term is the one used
searchData.results = content; // when starting the query
if (term === searchData.term) {
searchData.noResults = content.resultTypes.length === 0;
searchData.results = content;
if (searchContext && searchContext.type === "topic") { if (searchContext && searchContext.type === "topic") {
widget.appEvents.trigger("post-stream:refresh", { force: true }); widget.appEvents.trigger("post-stream:refresh", { force: true });
searchData.topicId = searchContext.id; searchData.topicId = searchContext.id;
} else { } else {
searchData.topicId = null; searchData.topicId = null;
}
} }
}) })
.catch(popupAjaxError) .catch(popupAjaxError)
.finally(() => { .finally(() => {
searchData.loading = false; searchData.loading = false;
widget.scheduleRerender(); widget.scheduleRerender();
this._activeSearch = null;
}); });
} }
} }