diff --git a/frontend_tests/node_tests/reactions.js b/frontend_tests/node_tests/reactions.js index d99ba8389f..071f3b5d45 100644 --- a/frontend_tests/node_tests/reactions.js +++ b/frontend_tests/node_tests/reactions.js @@ -15,8 +15,18 @@ set_global('emoji', { alien: '1f47d', smile: '1f604', }, - realm_emojis: { - realm_emoji: 'whatever', + all_realm_emojis: { + realm_emoji: { + emoji_name: 'realm_emoji', + emoji_url: 'TBD', + deactivated: false, + }, + }, + active_realm_emojis: { + realm_emoji: { + emoji_name: 'realm_emoji', + emoji_url: 'TBD', + }, }, }); diff --git a/static/js/emoji.js b/static/js/emoji.js index 163c037378..593978fe01 100644 --- a/static/js/emoji.js +++ b/static/js/emoji.js @@ -3,7 +3,7 @@ var emoji = (function () { var exports = {}; exports.emojis = []; -exports.realm_emojis = {}; +exports.all_realm_emojis = {}; exports.active_realm_emojis = {}; exports.emojis_by_name = {}; exports.emojis_name_to_css_class = {}; @@ -33,18 +33,18 @@ _.each(emoji_codes.codepoints, function (value) { }); exports.update_emojis = function update_emojis(realm_emojis) { - // exports.realm_emojis is emptied before adding the realm-specific emoji to it. + // exports.all_realm_emojis is emptied before adding the realm-specific emoji to it. // This makes sure that in case of deletion, the deleted realm_emojis don't - // persist in exports.realm_emojis or exports.active_realm_emojis. - exports.realm_emojis = {}; + // persist in exports.all_realm_emojis or exports.active_realm_emojis. + exports.all_realm_emojis = {}; exports.active_realm_emojis = {}; // Copy the default emoji list and add realm-specific emoji to it exports.emojis = default_emojis.slice(0); _.each(realm_emojis, function (data, name) { - exports.realm_emojis[name] = {emoji_name: name, - emoji_url: data.source_url, - deactivated: data.deactivated}; + exports.all_realm_emojis[name] = {emoji_name: name, + emoji_url: data.source_url, + deactivated: data.deactivated}; if (data.deactivated !== true) { // export.emojis are used in composebox autocomplete. This condition makes sure // that deactivated emojis don't appear in the autocomplete. @@ -56,7 +56,7 @@ exports.update_emojis = function update_emojis(realm_emojis) { }); // Add the Zulip emoji to the realm emojis list exports.emojis.push(zulip_emoji); - exports.realm_emojis.zulip = zulip_emoji; + exports.all_realm_emojis.zulip = zulip_emoji; exports.active_realm_emojis.zulip = zulip_emoji; exports.emojis_by_name = {}; diff --git a/static/js/reactions.js b/static/js/reactions.js index 212d3b7d2b..aa94012128 100644 --- a/static/js/reactions.js +++ b/static/js/reactions.js @@ -316,9 +316,9 @@ exports.get_message_reactions = function (message) { title: generate_title(emoji_name, user_ids), emoji_alt_code: page_params.emoji_alt_code, }; - if (emoji.realm_emojis[reaction.emoji_name]) { + if (emoji.all_realm_emojis[reaction.emoji_name]) { reaction.is_realm_emoji = true; - reaction.url = emoji.realm_emojis[reaction.emoji_name].emoji_url; + reaction.url = emoji.all_realm_emojis[reaction.emoji_name].emoji_url; } if (user_ids.indexOf(page_params.user_id) !== -1) { reaction.class = "message_reaction reacted";