paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

pills: Cleanup source initialization in pill_typeahead.

Browse Source 
Source in pill_typeahead, was intialized in a
very tricky way. In this cleanup, we refactor it
to clearly reflect how source is initialized for
different cases. These changes do not change its
behavior for its current use and solve potential
issues, so that it could be safely used at places
that do not require user pills at all.
This commit is contained in:
m-e-l-u-h-a-n
2021-05-25 01:05:57 +05:30
committed by Tim Abbott
parent 0080daa5a3
commit 069718cdc7
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
static/js/pill_typeahead.js
View File

@@ -26,27 +26,43 @@ export function set_up(input, pills, opts) {
blueslip.error("Unspecified possible item types");
return;
}
let source = opts.source;
if (!opts.source) {
source = () => user_pill.typeahead_source(pills);
}
const include_streams = (query) => opts.stream && query.trim().startsWith("#");
const include_user_groups = opts.user_group;
const include_users = opts.user;
let user_source;
if (opts.user_source) {
user_source = opts.user_source;
}
input.typeahead({
items: 5,
fixed: true,
dropup: true,
source() {
let source = [];
if (include_streams(this.query)) {
// If query starts with # we expect,
// only stream suggestions so we simply
// return stream source.
return stream_pill.typeahead_source(pills);
}
if (include_user_groups) {
return user_group_pill.typeahead_source(pills).concat(source());
source = source.concat(user_group_pill.typeahead_source(pills));
}
return source();
if (include_users) {
if (user_source !== undefined) {
// If user_source is specified in opts, it
// is given priority. Otherwise we use
// default user_pill.typeahead_source.
source = source.concat(user_source());
} else {
source = source.concat(user_pill.typeahead_source(pills));
}
}
return source;
},
highlighter(item) {
if (include_streams(this.query)) {

2
static/js/stream_edit.js
View File

@@ -419,7 +419,7 @@ function show_subscription_settings(sub) {
});
const opts = {
source: get_users_for_subscriber_typeahead,
user_source: get_users_for_subscriber_typeahead,
stream: true,
user_group: true,
user: true,