github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 17:16:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: make sure there are meaningful titles on the picker

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2017-07-22 17:32:12 +02:00
parent 8ef4d6d812
commit e2e0221dd7
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/emoji-picker.js.es6
View File

@ -139,16 +139,18 @@ export default Ember.Component.extend({
this._bindEvents(); this._bindEvents();
Ember.run.scheduleOnce("afterRender", this, function() { Ember.run.scheduleOnce("afterRender", this, function() {
this._loadCategoriesEmojis();
this._setDiversity(); this._setDiversity();
this._positionPicker(); this._positionPicker();
this._scrollTo(); this._scrollTo();
this._loadCategoriesEmojis();
}); });
}, },
_loadCategoriesEmojis() { _loadCategoriesEmojis() {
$.each($picker.find(".categories-column button.emoji"), (_, button) => { $.each($picker.find(".categories-column button.emoji"), (_, button) => {
this._setButtonBackground(button, false); const $button = $(button);
const code = this._codeWithDiversity($button.data("tabicon"), false);
$button.css("background-image", `url("${emojiUrlFor(code)}")`);
}); });
}, },

8
app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
View File

@ -1,17 +1,17 @@
<div class='categories-column'> <div class='categories-column'>
<div class='category-icon'> <div class='category-icon'>
<button type="button" class="emoji" tabindex="-1" title="star" data-section="recent"></button> <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
</div> </div>
<% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %> <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
<div class='category-icon'> <div class='category-icon'>
<button type="button" class="emoji" tabindex="-1" data-section="<%= group["name"] %>" title="<%= group["tabicon"] %>"></button> <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="<%= group["fullname"] %>"></button>
</div> </div>
<% end %> <% end %>
<% if !Emoji.custom.blank? %> <% if !Emoji.custom.blank? %>
<div class='category-icon'> <div class='category-icon'>
<button data-section="ungrouped" type="button" class="emoji" tabindex="-1" title="<%= Emoji.custom.first.name %>"></button> <button data-tabicon="<%= Emoji.custom.first.name %>" type="button" class="emoji" tabindex="-1" data-section="ungrouped" title="{{i18n 'emoji_picker.custom'}}"></button>
</div> </div>
<% end %> <% end %>
</div> </div>
@ -66,7 +66,7 @@
<div class='info'></div> <div class='info'></div>
<div class='diversity-picker'> <div class='diversity-picker'>
<% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %> <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
<a href='#' class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>"> <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
{{fa-icon "check"}} {{fa-icon "check"}}
</a> </a>
<% end %> <% end %>

6
config/locales/client.en.yml
View File

@ -1145,6 +1145,12 @@ en:
celebration: Celebration celebration: Celebration
custom: Custom emojis custom: Custom emojis
recent: Recently used recent: Recently used
default_tone: No skin tone
light_tone: Light skin tone
medium_light_tone: Medium light skin tone
medium_tone: Medium skin tone
medium_dark_tone: Medium dark skin tone
dark_tone: Dark skin tone
composer: composer:
emoji: "Emoji :)" emoji: "Emoji :)"