Various fixes and improvements to emojification.

- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Add emoji shortcodes as titles
This commit is contained in:
Aviral Dasgupta 2016-08-09 21:40:05 +05:30
parent 4b8ad3c102
commit dbbea63227
5 changed files with 83 additions and 6 deletions

View file

@ -19,6 +19,7 @@ var sdk = require('../../index');
var dis = require("../../dispatcher");
var WhoIsTyping = require("../../WhoIsTyping");
var MatrixClientPeg = require("../../MatrixClientPeg");
import {emojifyText} from '../../HtmlUtils';
module.exports = React.createClass({
displayName: 'RoomStatusBar',
@ -259,10 +260,11 @@ module.exports = React.createClass({
}
var typingString = this.state.whoisTypingString;
const typingHtml = emojifyText(typingString);
if (typingString) {
return (
<div className="mx_RoomStatusBar_typingBar">
{typingString}
<span dangerouslySetInnerHTML={typingHtml} />
</div>
);
}