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

user-groups: Add user groups in typeahead code.

This commit is contained in:
Umair Khan 2017-11-08 13:05:13 +05:00 committed by Tim Abbott
parent 0e21cbc5d9
commit 597a6e6c74
4 changed files with 71 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend_tests/node_tests/composebox_typeahead.js
View File

@ -6,6 +6,7 @@ zrequire('Handlebars', 'handlebars');
zrequire('templates');
zrequire('typeahead_helper');
zrequire('people');
zrequire('user_groups');
zrequire('stream_data');
zrequire('composebox_typeahead');

4
static/js/compose.js
View File

@ -566,6 +566,10 @@ exports.initialize = function () {
}
}
// User group mentions will fall through here. In the future,
// we may want to add some sort of similar warning for cases
// where nobody in the group is subscribed, but that decision
// can wait on user feedback.
});
$("#compose-all-everyone").on('click', '.compose-all-everyone-confirm', function (event) {

56
static/js/composebox_typeahead.js
View File

@ -57,6 +57,14 @@ function query_matches_person(query, person) {
|| person.full_name.toLowerCase().indexOf(query) !== -1);
}
function query_matches_user_group(query, user_group) {
// Case-insensitive.
query = query.toLowerCase();
return (user_group.name.toLowerCase().indexOf(query) !== -1
|| user_group.description.toLowerCase().indexOf(query) !== -1);
}
function query_matches_stream(query, stream) {
query = query.toLowerCase();
@ -334,7 +342,8 @@ exports.compose_content_begins_typeahead = function (query) {
full_name: "everyone",
};
var persons = people.get_realm_persons();
return [].concat(persons, [all_item, everyone_item]);
var groups = user_groups.get_realm_user_groups();
return [].concat(persons, [all_item, everyone_item], groups);
}
if (this.options.completions.stream && current_token[0] === '#') {
@ -360,7 +369,13 @@ exports.content_highlighter = function (item) {
if (this.completing === 'emoji') {
return typeahead_helper.render_emoji(item);
} else if (this.completing === 'mention') {
return typeahead_helper.render_person(item);
var rendered;
if (user_groups.is_user_group(item)) {
rendered = typeahead_helper.render_user_group(item);
} else {
rendered = typeahead_helper.render_person(item);
}
return rendered;
} else if (this.completing === 'stream') {
return typeahead_helper.render_stream(item);
} else if (this.completing === 'syntax') {
@ -385,9 +400,14 @@ exports.content_typeahead_selected = function (item) {
beginning = (beginning.substring(0, beginning.length - this.token.length - 1) + " :" + item.emoji_name + ": ");
}
} else if (this.completing === 'mention') {
beginning = (beginning.substring(0, beginning.length - this.token.length - 1)
+ '@**' + item.full_name + '** ');
$(document).trigger('usermention_completed.zulip', {mentioned: item});
beginning = beginning.substring(0, beginning.length - this.token.length - 1);
if (user_groups.is_user_group(item)) {
beginning += '@*' + item.name + '* ';
$(document).trigger('usermention_completed.zulip', {user_group: item});
} else {
beginning += '@**' + item.full_name + '** ';
$(document).trigger('usermention_completed.zulip', {mentioned: item});
}
} else if (this.completing === 'stream') {
beginning = (beginning.substring(0, beginning.length - this.token.length - 1)
+ '#**' + item.name + '** ');
@ -423,7 +443,13 @@ exports.compose_content_matcher = function (item) {
if (this.completing === 'emoji') {
return query_matches_emoji(this.token, item);
} else if (this.completing === 'mention') {
return query_matches_person(this.token, item);
var matches;
if (user_groups.is_user_group(item)) {
matches = query_matches_user_group(this.token, item);
} else {
matches = query_matches_person(this.token, item);
}
return matches;
} else if (this.completing === 'stream') {
return query_matches_stream(this.token, item);
} else if (this.completing === 'syntax') {
@ -435,9 +461,21 @@ exports.compose_matches_sorter = function (matches) {
if (this.completing === 'emoji') {
return typeahead_helper.sort_emojis(matches, this.token);
} else if (this.completing === 'mention') {
return typeahead_helper.sort_recipients(matches, this.token,
compose_state.stream_name(),
compose_state.subject());
var recipients = [];
var groups = [];
_.each(matches, function (match) {
if (user_groups.is_user_group(match)) {
groups.push(match);
} else {
recipients.push(match);
}
});
recipients = typeahead_helper.sort_recipients(recipients, this.token,
compose_state.stream_name(),
compose_state.subject());
groups = typeahead_helper.sort_user_groups(groups, this.token);
return recipients.concat(groups);
} else if (this.completing === 'stream') {
return typeahead_helper.sort_streams(matches, this.token);
} else if (this.completing === 'syntax') {

20
static/js/typeahead_helper.js
View File

@ -75,7 +75,7 @@ exports.render_typeahead_item = function (args) {
return templates.render('typeahead_list_item', args);
};
var rendered = { persons: new Dict(), streams: new Dict() };
var rendered = { persons: new Dict(), streams: new Dict(), user_groups: new Dict() };
exports.render_person = function (person) {
if (person.special_item_text) {
@ -94,6 +94,19 @@ exports.render_person = function (person) {
return html;
};
exports.render_user_group = function (user_group) {
var html = rendered.user_groups.get(user_group.id);
if (html === undefined) {
html = exports.render_typeahead_item({
primary: user_group.name,
secondary: user_group.description,
});
rendered.user_groups.set(user_group.id, html);
}
return html;
};
exports.render_stream = function (stream) {
var desc = stream.description;
var short_desc = desc.substring(0, 35);
@ -264,6 +277,11 @@ exports.sort_recipients = function (matches, query, current_stream, current_subj
return matches_sorted.concat(rest_sorted);
};
exports.sort_user_groups = function (matches, query) {
var results = util.prefix_sort(query, matches, function (x) { return x.name; });
return results.matches.concat(results.rest);
};
exports.sort_emojis = function (matches, query) {
// TODO: sort by category in v2
var results = util.prefix_sort(query, matches, function (x) { return x.emoji_name; });