Merge pull request #395 from aviraldg/fix-emoji

Various fixes and improvements to emojification.
This commit is contained in:
David Baker
2016-08-11 10:23:00 +01:00
committed by GitHub
13 changed files with 136 additions and 34 deletions

View File

@@ -189,6 +189,7 @@ module.exports = React.createClass({
_getContent: function() {
var TabCompleteBar = sdk.getComponent('rooms.TabCompleteBar');
var TintableSvg = sdk.getComponent("elements.TintableSvg");
const EmojiText = sdk.getComponent('elements.EmojiText');
// no conn bar trumps unread count since you can't get unread messages
// without a connection! (technically may already have some but meh)
@@ -262,7 +263,7 @@ module.exports = React.createClass({
if (typingString) {
return (
<div className="mx_RoomStatusBar_typingBar">
{typingString}
<EmojiText>{typingString}</EmojiText>
</div>
);
}