Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: Clean up compose_content_matcher. 

The switch statement is easier to read, and
we also want to eventually remove the "this"
that couples us to the awkward typeahead
hacks.
This commit is contained in:
Steve Howell 2019-12-23 18:18:24 +00:00 committed by Tim Abbott
parent ebf4195bf3
commit c2c5878c3a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
static/js/composebox_typeahead.js
View File

@ -713,21 +713,25 @@ exports.content_typeahead_selected = function (item, event) {
};
exports.compose_content_matcher = function (item) {
if (this.completing === 'emoji') {
return query_matches_emoji(this.token, item);
} else if (this.completing === 'mention' || this.completing === 'silent_mention') {
return query_matches_person_or_user_group(this.token, item);
} else if (this.completing === 'slash') {
return query_matches_slash_commmand(this.token, item);
} else if (this.completing === 'stream') {
return query_matches_user_group_or_stream(this.token, item);
} else if (this.completing === 'syntax') {
return query_matches_language(this.token, item);
} else if (this.completing === 'topic_jump') {
const token = this.token;
switch (this.completing) {
case 'emoji':
return query_matches_emoji(token, item);
case 'mention':
case 'silent_mention':
return query_matches_person_or_user_group(token, item);
case 'slash':
return query_matches_slash_commmand(token, item);
case 'stream':
return query_matches_user_group_or_stream(token, item);
case 'syntax':
return query_matches_language(token, item);
case 'topic_jump':
// topic_jump doesn't actually have a typeahead popover, so we return quickly here.
return true;
} else if (this.completing === 'topic_list') {
return query_matches_topic(this.token, item);
case 'topic_list':
return query_matches_topic(token, item);
}
};