Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename: Avatar -> ComposerAvatar

Browse Source 
To avoid confusion with other components that also might be named Avatar

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
This commit is contained in:
YaoiFangirl420 2019-04-13 01:44:36 -07:00
parent 3dae9f3d58
commit f7462371b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/MessageComposer.js
View File

@ -42,14 +42,14 @@ const formatButtonList = [
_td("numbered-list"), _td("numbered-list"),
]; ];
function Avatar(props) { function ComposerAvatar(props) {
const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar'); const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
return <div className="mx_MessageComposer_avatar"> return <div className="mx_MessageComposer_avatar">
<MemberStatusMessageAvatar member={props.me} width={24} height={24} /> <MemberStatusMessageAvatar member={props.me} width={24} height={24} />
</div>; </div>;
} }
Avatar.propTypes = { ComposerAvatar.propTypes = {
me: PropTypes.object.isRequired, me: PropTypes.object.isRequired,
} }
@ -393,7 +393,7 @@ export default class MessageComposer extends React.Component {
render() { render() {
const controls = [ const controls = [
this.state.me ? <Avatar key="controls_avatar" me={this.state.me} /> : null, this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
this.props.e2eStatus ? <E2EIcon key="e2eIcon" status={this.props.e2eStatus} className="mx_MessageComposer_e2eIcon" /> : null, this.props.e2eStatus ? <E2EIcon key="e2eIcon" status={this.props.e2eStatus} className="mx_MessageComposer_e2eIcon" /> : null,
]; ];