mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Display custom emoji in account notes in WebUI (fixes #595)

This commit is contained in:
Thibaut Girka 2018-07-21 18:10:56 +02:00 committed by ThibG
parent c99054ecb2
commit 1aa253c41d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/account/components/header.js
View File

@ -83,7 +83,7 @@ export default class Header extends ImmutablePureComponent {
actionBtn = ''; actionBtn = '';
} }
const { text, metadata } = processBio(account.get('note')); const { text, metadata } = processBio(account.get('note_emojified'));
return ( return (
<div className='account__header__wrapper'> <div className='account__header__wrapper'>
@ -121,8 +121,8 @@ export default class Header extends ImmutablePureComponent {
<div className='account__header__fields'> <div className='account__header__fields'>
{metadata.map((pair, i) => ( {metadata.map((pair, i) => (
<dl key={i}> <dl key={i}>
<dt dangerouslySetInnerHTML={{ __html: emojify(pair[0]) }} title={pair[0]} /> <dt dangerouslySetInnerHTML={{ __html: pair[0] }} title={pair[0]} />
<dd dangerouslySetInnerHTML={{ __html: emojify(pair[1]) }} title={pair[1]} /> <dd dangerouslySetInnerHTML={{ __html: pair[1] }} title={pair[1]} />
</dl> </dl>
))} ))}
</div> </div>