paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji: Rename emoji.realm_emojis to emoji.all_realm_emojis.

Browse Source
This commit is contained in:
Harshit Bansal
2017-06-23 21:41:41 +00:00
committed by Tim Abbott
parent 29ff36cd2a
commit a6cd460f72
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend_tests/node_tests/reactions.js
View File

@@ -15,8 +15,18 @@ set_global('emoji', {
alien: '1f47d', alien: '1f47d',
smile: '1f604', smile: '1f604',
}, },
realm_emojis: { all_realm_emojis: {
realm_emoji: 'whatever', realm_emoji: {
emoji_name: 'realm_emoji',
emoji_url: 'TBD',
deactivated: false,
},
},
active_realm_emojis: {
realm_emoji: {
emoji_name: 'realm_emoji',
emoji_url: 'TBD',
},
}, },
}); });

12
static/js/emoji.js
View File

@@ -3,7 +3,7 @@ var emoji = (function () {
var exports = {}; var exports = {};
exports.emojis = []; exports.emojis = [];
exports.realm_emojis = {}; exports.all_realm_emojis = {};
exports.active_realm_emojis = {}; exports.active_realm_emojis = {};
exports.emojis_by_name = {}; exports.emojis_by_name = {};
exports.emojis_name_to_css_class = {}; exports.emojis_name_to_css_class = {};
@@ -33,16 +33,16 @@ _.each(emoji_codes.codepoints, function (value) {
}); });
exports.update_emojis = function update_emojis(realm_emojis) { 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 // This makes sure that in case of deletion, the deleted realm_emojis don't
// persist in exports.realm_emojis or exports.active_realm_emojis. // persist in exports.all_realm_emojis or exports.active_realm_emojis.
exports.realm_emojis = {}; exports.all_realm_emojis = {};
exports.active_realm_emojis = {}; exports.active_realm_emojis = {};
// Copy the default emoji list and add realm-specific emoji to it // Copy the default emoji list and add realm-specific emoji to it
exports.emojis = default_emojis.slice(0); exports.emojis = default_emojis.slice(0);
_.each(realm_emojis, function (data, name) { _.each(realm_emojis, function (data, name) {
exports.realm_emojis[name] = {emoji_name: name, exports.all_realm_emojis[name] = {emoji_name: name,
emoji_url: data.source_url, emoji_url: data.source_url,
deactivated: data.deactivated}; deactivated: data.deactivated};
if (data.deactivated !== true) { if (data.deactivated !== true) {
@@ -56,7 +56,7 @@ exports.update_emojis = function update_emojis(realm_emojis) {
}); });
// Add the Zulip emoji to the realm emojis list // Add the Zulip emoji to the realm emojis list
exports.emojis.push(zulip_emoji); 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.active_realm_emojis.zulip = zulip_emoji;
exports.emojis_by_name = {}; exports.emojis_by_name = {};

4
static/js/reactions.js
View File

@@ -316,9 +316,9 @@ exports.get_message_reactions = function (message) {
title: generate_title(emoji_name, user_ids), title: generate_title(emoji_name, user_ids),
emoji_alt_code: page_params.emoji_alt_code, 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.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) { if (user_ids.indexOf(page_params.user_id) !== -1) {
reaction.class = "message_reaction reacted"; reaction.class = "message_reaction reacted";