Add EmojiText component for emoji replacement.

This commit is contained in:
Aviral Dasgupta 2016-08-10 00:31:51 +05:30
parent dbbea63227
commit 09e8a45cde
10 changed files with 59 additions and 38 deletions

View file

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