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

REFACTOR: Remove `Discourse.SiteSettings` from `lib:search`

This commit is contained in:
Robin Ward 2020-07-22 11:48:50 -04:00
parent aa2eea7729
commit 0bf28e418f
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/controllers/full-page-search.js
View File

@ -89,7 +89,7 @@ export default Controller.extend({
@discourseComputed("q")
searchActive(q) {
return isValidSearchTerm(q);
return isValidSearchTerm(q, this.siteSettings);
},
@discourseComputed("q")
@ -209,7 +209,7 @@ export default Controller.extend({
this.set("invalidSearch", false);
const searchTerm = this.searchTerm;
if (!isValidSearchTerm(searchTerm)) {
if (!isValidSearchTerm(searchTerm, this.siteSettings)) {
this.set("invalidSearch", true);
return;
}

8
app/assets/javascripts/discourse/app/lib/search.js
View File

@ -185,11 +185,9 @@ export function getSearchKey(args) {
);
}
export function isValidSearchTerm(searchTerm) {
export function isValidSearchTerm(searchTerm, siteSettings) {
if (searchTerm) {
return (
searchTerm.trim().length >= Discourse.SiteSettings.min_search_term_length
);
return searchTerm.trim().length >= siteSettings.min_search_term_length;
} else {
return false;
}
@ -226,7 +224,7 @@ export function applySearchAutocomplete(
)
);
if (Discourse.SiteSettings.enable_mentions) {
if (siteSettings.enable_mentions) {
$input.autocomplete(
_.merge(
{

4
app/assets/javascripts/discourse/app/routes/full-page-search.js
View File

@ -46,8 +46,8 @@ export default DiscourseRoute.extend({
return cached.data.model;
}
return PreloadStore.getAndRemove("search", function() {
if (isValidSearchTerm(params.q)) {
return PreloadStore.getAndRemove("search", () => {
if (isValidSearchTerm(params.q, this.siteSettings)) {
return ajax("/search", { data: args });
} else {
return null;

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

@ -40,7 +40,7 @@ const SearchHelper = {
const searchContext = contextEnabled ? widget.searchContext() : null;
const fullSearchUrl = widget.fullSearchUrl();
if (!isValidSearchTerm(term)) {
if (!isValidSearchTerm(term, widget.siteSettings)) {
searchData.noResults = true;
searchData.results = [];
searchData.loading = false;
@ -298,7 +298,7 @@ export default createWidget("search-menu", {
},
fullSearch() {
if (!isValidSearchTerm(searchData.term)) {
if (!isValidSearchTerm(searchData.term, this.siteSettings)) {
return;
}