IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: emoji toolbar improvements

Browse Source
This commit is contained in:
Arpit Jalan
2015-07-28 22:49:26 +05:30
parent 7518918b8f
commit a45e87746e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6
View File

@@ -141,8 +141,16 @@ var toolbar = function(selected){
if (!recentlyUsedIcons) { initializeRecentlyUsedIcons(); } if (!recentlyUsedIcons) { initializeRecentlyUsedIcons(); }
return _.map(groups, function(g, i){ return _.map(groups, function(g, i){
var icon = g.name === "recent" ? "star2" : g.icons[0]; var icon = g.tabicon;
var row = {src: Discourse.Emoji.urlFor(icon), groupId: i}; var title = g.fullname;
if (g.name === "recent") {
icon = "star2";
title = "Recent"
} else if (g.name === "ungrouped") {
icon = g.icons[0];
title = "Custom"
}
var row = {src: Discourse.Emoji.urlFor(icon), title: title, groupId: i};
if(i === selected){ if(i === selected){
row.selected = true; row.selected = true;
} }

2
app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
View File

@@ -1,6 +1,6 @@
<div class='emoji-modal'> <div class='emoji-modal'>
<ul class='toolbar'> <ul class='toolbar'>
{{#each item in toolbarItems}}<li><a {{#if item.selected}}class='selected'{{/if}} data-group-id='{{item.groupId}}'><img src='{{item.src}}' class='emoji'></a></li>{{/each}} {{#each item in toolbarItems}}<li><a title='{{item.title}}' {{#if item.selected}}class='selected'{{/if}} data-group-id='{{item.groupId}}'><img src='{{item.src}}' class='emoji'></a></li>{{/each}}
</ul> </ul>
<div class='emoji-table-wrapper'> <div class='emoji-table-wrapper'>
<table class='emoji-page'> <table class='emoji-page'>