imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reskindex and use sdk.getComponent for EmojiText

Browse source
This commit is contained in:
Aviral Dasgupta 2016-08-11 07:55:12 +05:30
parent 1b414cad18
commit 4c1dcb924b
10 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/messages/SenderProfile.js
View file

@ -17,9 +17,10 @@
'use strict';
import React from 'react';
import EmojiText from '../elements/EmojiText';
import sdk from '../../../index';
export default function SenderProfile(props) {
const EmojiText = sdk.getComponent('elements.EmojiText');
const {mxEvent} = props;
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
const {msgtype} = mxEvent.getContent();

2
src/components/views/messages/TextualBody.js
View file

@ -23,7 +23,6 @@ var linkify = require('linkifyjs');
var linkifyElement = require('linkifyjs/element');
var linkifyMatrix = require('../../../linkify-matrix');
var sdk = require('../../../index');
import EmojiText from '../../views/elements/EmojiText';
linkifyMatrix(linkify);
@ -178,6 +177,7 @@ module.exports = React.createClass({
},
render: function() {
const EmojiText = sdk.getComponent('elements.EmojiText');
var mxEvent = this.props.mxEvent;
var content = mxEvent.getContent();
var body = HtmlUtils.bodyToHtml(content, this.props.highlights, {});

3
src/components/views/messages/TextualEvent.js
View file

@ -19,7 +19,7 @@ limitations under the License.
var React = require('react');
var TextForEvent = require('../../../TextForEvent');
import EmojiText from '../elements/EmojiText';
import sdk from '../../../index';
module.exports = React.createClass({
displayName: 'TextualEvent',
@ -31,6 +31,7 @@ module.exports = React.createClass({
},
render: function() {
const EmojiText = sdk.getComponent('elements.EmojiText');
var text = TextForEvent.textForEvent(this.props.mxEvent);
if (text == null || text.length === 0) return null;
return (