paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 01:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

toggle_reactions_popover: Support being passed no message ID.

Browse Source 
This is intended to facilitate calling this function for the compose
picker, where there is no message yet.
This commit is contained in:
Tim Abbott
2017-04-30 15:04:51 -07:00
parent 3c257a19c0
commit 87d06268ca
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/emoji_picker.js
View File

@@ -75,7 +75,6 @@ function compute_placement(elt) {
} }
function generate_emoji_picker_content(id) { function generate_emoji_picker_content(id) {
var emojis_used = reactions.get_emojis_used_by_user_for_message_id(id);
var emojis = _.clone(emoji.emojis_name_to_css_class); var emojis = _.clone(emoji.emojis_name_to_css_class);
var realm_emojis = emoji.realm_emojis; var realm_emojis = emoji.realm_emojis;
@@ -86,6 +85,10 @@ function generate_emoji_picker_content(id) {
url: realm_emoji.emoji_url, url: realm_emoji.emoji_url,
}; };
}); });
// Reacting to a specific message
if (id !== undefined) {
var emojis_used = reactions.get_emojis_used_by_user_for_message_id(id);
_.each(emojis_used, function (emoji_name) { _.each(emojis_used, function (emoji_name) {
emojis[emoji_name] = { emojis[emoji_name] = {
name: emoji_name, name: emoji_name,
@@ -95,6 +98,7 @@ function generate_emoji_picker_content(id) {
url: emojis[emoji_name].url, url: emojis[emoji_name].url,
}; };
}); });
}
var emoji_recs = _.map(emojis, function (val, emoji_name) { var emoji_recs = _.map(emojis, function (val, emoji_name) {
if (val.name) { if (val.name) {
@@ -128,8 +132,10 @@ exports.toggle_reactions_popover = function (element, id) {
return; return;
} }
current_msg_list.select_id(id);
var elt = $(element); var elt = $(element);
if (id !== undefined) {
current_msg_list.select_id(id);
}
if (elt.data('popover') === undefined) { if (elt.data('popover') === undefined) {
elt.prop('title', ''); elt.prop('title', '');