paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

search: Duplicate get_default_suggestion.

Browse Source 
This lets us modify the implementation of this function for the search
pills implementation only.
This commit is contained in:
Tim Abbott
2018-07-14 16:38:34 +05:30
parent 5b0e9b7fe6
commit db4f6e278f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/search_suggestion.js
View File

@@ -233,6 +233,15 @@ function get_default_suggestion(operators) {
return format_as_suggestion(operators); return format_as_suggestion(operators);
} }
function get_default_suggestion_legacy(operators) {
// Here we return the canonical suggestion for the full query that the
// user typed. (The caller passes us the parsed query as "operators".)
if (operators.length === 0) {
return {description: '', search_string: ''};
}
return format_as_suggestion(operators);
}
function get_topic_suggestions(last, operators) { function get_topic_suggestions(last, operators) {
var invalid = [ var invalid = [
{operator: 'pm-with'}, {operator: 'pm-with'},
@@ -699,7 +708,7 @@ exports.get_suggestions_legacy = function (query) {
// is not displayed in that case. e.g. `messages with one or more abc` as // is not displayed in that case. e.g. `messages with one or more abc` as
// a suggestion for `has:abc`does not make sense. // a suggestion for `has:abc`does not make sense.
if (last.operator !== '' && last.operator !== 'has' && last.operator !== 'is') { if (last.operator !== '' && last.operator !== 'has' && last.operator !== 'is') {
suggestion = get_default_suggestion(operators); suggestion = get_default_suggestion_legacy(operators);
result = [suggestion]; result = [suggestion];
} }
@@ -707,7 +716,7 @@ exports.get_suggestions_legacy = function (query) {
if (operators.length > 1) { if (operators.length > 1) {
base_operators = operators.slice(0, -1); base_operators = operators.slice(0, -1);
} }
base = get_default_suggestion(base_operators); base = get_default_suggestion_legacy(base_operators);
// Get all individual suggestions, and then attach_suggestions // Get all individual suggestions, and then attach_suggestions
// mutates the list 'result' to add a properly-formatted suggestion // mutates the list 'result' to add a properly-formatted suggestion