paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 06:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji_picker: Don't display title text for emojis in emoji picker.

Browse Source 
Now that we display the name and aliases of the currently focused
emoji at the bottom of the emoji picker, we don't need to display
the title text for emojis separately.

Fixes: #6111.
This commit is contained in:
Harshit Bansal
2017-09-29 20:16:36 +00:00
parent bb38f98975
commit b69e85fa05
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/templates.js
View File

@@ -600,8 +600,8 @@ function render(template_name, args) {
html += render('emoji_popover_content', args); html += render('emoji_popover_content', args);
html += "</div>"; html += "</div>";
// test to make sure the first emoji is present in the popover // test to make sure the first emoji is present in the popover
var emoji_key = $(html).find(".emoji-100").attr('title'); var first_emoji = $(html).find(".emoji-100");
assert.equal(emoji_key, '100'); assert.equal(first_emoji.length, 1);
var categories = $(html).find(".emoji-popover-tab-item"); var categories = $(html).find(".emoji-popover-tab-item");
assert.equal(categories.length, 2); assert.equal(categories.length, 2);

4
static/templates/emoji_popover_emoji.handlebars
View File

@@ -1,9 +1,9 @@
{{#with emoji_dict}} {{#with emoji_dict}}
<div class="emoji-popover-emoji {{# if ../message_id }}{{#if has_reacted}} reacted {{/if}} reaction {{else}} composition {{/if}}" data-emoji-name={{name}} tabindex="0" data-emoji-id="{{../type}}_{{../section}}_{{../index}}"> <div class="emoji-popover-emoji {{# if ../message_id }}{{#if has_reacted}} reacted {{/if}} reaction {{else}} composition {{/if}}" data-emoji-name={{name}} tabindex="0" data-emoji-id="{{../type}}_{{../section}}_{{../index}}">
{{#if is_realm_emoji}} {{#if is_realm_emoji}}
<img src="{{url}}" class="emoji" title="{{name}}" /> <img src="{{url}}" class="emoji"/>
{{else}} {{else}}
<div class="emoji emoji-{{css_class}}" title="{{name}}"></div> <div class="emoji emoji-{{css_class}}"></div>
{{/if}} {{/if}}
</div> </div>
{{/with}} {{/with}}