Merge branch 'bugfix/emoji-tooltip' into 'develop'

entity normalizer: add tooltip text to emojis

Closes #544

See merge request pleroma/pleroma-fe!798
This commit is contained in:
kaniini 2019-05-17 20:15:12 +00:00
commit e14a15845c

View file

@ -171,7 +171,7 @@ export const addEmojis = (string, emojis) => {
return emojis.reduce((acc, emoji) => { return emojis.reduce((acc, emoji) => {
return acc.replace( return acc.replace(
new RegExp(`:${emoji.shortcode}:`, 'g'), new RegExp(`:${emoji.shortcode}:`, 'g'),
`<img src='${emoji.url}' alt='${emoji.shortcode}' class='emoji' />` `<img src='${emoji.url}' alt='${emoji.shortcode}' title='${emoji.shortcode}' class='emoji' />`
) )
}, string) }, string)
} }