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

emoji: Rename css_class to emoji_code in emoji.js.

Browse Source 
Now that `emoji_collection` and `emojis_by_name` are global
datasources in the webapp we need to rename things carefully
to reflect their actual meaning. The fact that emoji code is
used as a css class for unicode emoji is one thing but it is
not its sole use so renaming it seems a good idea.
This commit is contained in:
Harshit Bansal
2018-07-20 16:38:56 +00:00
committed by Tim Abbott
parent 88bc78645d
commit a906d564a3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/templates.js
View File

@@ -693,7 +693,7 @@ run_test('emoji_popover_content', () => {
has_reacted: false, has_reacted: false,
is_realm_emoji: false, is_realm_emoji: false,
name: '100', name: '100',
css_class: '100', emoji_code: '100',
}, },
], ],
}, },
@@ -733,13 +733,13 @@ run_test('emoji_popover_search_results', () => {
has_reacted: false, has_reacted: false,
is_realm_emoji: false, is_realm_emoji: false,
name: 'test-1', name: 'test-1',
css_class: 'test-1', emoji_code: 'test-1',
}, },
{ {
has_reacted: true, has_reacted: true,
is_realm_emoji: false, is_realm_emoji: false,
name: 'test-2', name: 'test-2',
css_class: 'test-2', emoji_code: 'test-2',
}, },
], ],
}; };
@@ -756,7 +756,7 @@ run_test('emoji_showcase', () => {
emoji_dict: { emoji_dict: {
name: "thumbs_up", name: "thumbs_up",
is_realm_emoji: false, is_realm_emoji: false,
css_class: "1f44d", emoji_code: "1f44d",
has_reacted: false, has_reacted: false,
}, },
}; };

2
static/js/emoji.js
View File

@@ -100,7 +100,7 @@ exports.build_emoji_data = function (realm_emojis) {
name: emoji_name, name: emoji_name,
aliases: emoji.default_emoji_aliases[codepoint], aliases: emoji.default_emoji_aliases[codepoint],
is_realm_emoji: false, is_realm_emoji: false,
css_class: codepoint, emoji_code: codepoint,
has_reacted: false, has_reacted: false,
}; };
exports.emojis_by_name[emoji_name] = emoji_dict; exports.emojis_by_name[emoji_name] = emoji_dict;

2
static/templates/emoji_popover_emoji.handlebars
View File

@@ -3,7 +3,7 @@
{{#if is_realm_emoji}} {{#if is_realm_emoji}}
<img src="{{url}}" class="emoji"/> <img src="{{url}}" class="emoji"/>
{{else}} {{else}}
<div class="emoji emoji-{{css_class}}"></div> <div class="emoji emoji-{{emoji_code}}"></div>
{{/if}} {{/if}}
</div> </div>
{{/with}} {{/with}}

2
static/templates/emoji_showcase.handlebars
View File

@@ -3,7 +3,7 @@
{{#if is_realm_emoji}} {{#if is_realm_emoji}}
<img src="{{url}}" class="emoji emoji-preview"/> <img src="{{url}}" class="emoji emoji-preview"/>
{{else}} {{else}}
<div class="emoji emoji-preview emoji-{{css_class}}"></div> <div class="emoji emoji-preview emoji-{{emoji_code}}"></div>
{{/if}} {{/if}}
<div class="emoji-canonical-name" title="{{name}}">{{name}}</div> <div class="emoji-canonical-name" title="{{name}}">{{name}}</div>
</div> </div>