List emoticons in emoji preview

Ignore when same but lowercase/uppercase
release
Etienne Lemay 2016-07-07 17:05:37 -04:00
parent 19eea428b8
commit 573ef818f5
2 changed files with 27 additions and 1 deletions

View File

@ -170,10 +170,17 @@
font-size: 12px;
color: #888;
}
.emoji-picker-preview-shortname + .emoji-picker-preview-shortname {
.emoji-picker-preview-shortname + .emoji-picker-preview-shortname,
.emoji-picker-preview-shortname + .emoji-picker-preview-emoticon,
.emoji-picker-preview-emoticon + .emoji-picker-preview-emoticon {
margin-left: .5em;
}
.emoji-picker-preview-emoticon {
font-size: 11px;
color: #bbb;
}
.emoji-picker-title span {
display: inline-block;
vertical-align: middle;

View File

@ -12,6 +12,22 @@ export default class Preview extends React.Component {
{ emojiProps, skinsProps } = this.props
if (emoji) {
var { text, texts } = emoji,
knownEmoticons = [],
emoticons = []
texts || (texts = [])
if (text && !texts.length) {
texts = [text]
}
for (let text of texts) {
if (knownEmoticons.indexOf(text.toLowerCase()) == -1) {
knownEmoticons.push(text.toLowerCase())
emoticons.push(text)
}
}
return <div className='emoji-picker-preview'>
<div className='emoji-picker-preview-emoji'>
<Emoji
@ -26,6 +42,9 @@ export default class Preview extends React.Component {
<span className='emoji-picker-preview-shortnames'>
{emoji.short_names.map((short_name) =>
<span key={short_name} className='emoji-picker-preview-shortname'>:{short_name}:</span>
)}<br />
{emoticons.map((emoticon) =>
<span key={emoticon} className='emoji-picker-preview-emoticon'>{emoticon}</span>
)}
</span>
</div>