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

Merge branch 'develop' into matthew/roomsettings2

Browse source
This commit is contained in:
Kegan Dougal 2016-01-18 10:49:45 +00:00
commit 2a64d0feb3
7 changed files with 212 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/rooms/MemberTile.js
View file

@ -151,14 +151,26 @@ module.exports = React.createClass({
}
var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
var av;
if (member) {
av = (
<MemberAvatar member={this.props.member} width={36} height={36} />
);
}
else {
av = (
<BaseAvatar name={name} width={36} height={36} />
);
}
return (
<div className={mainClassName} title={ this.getPowerLabel() }
onClick={ this.onClick } onMouseEnter={ this.mouseEnter }
onMouseLeave={ this.mouseLeave }>
<div className="mx_MemberTile_avatar">
<MemberAvatar member={this.props.member} width={36} height={36}
customDisplayName={this.props.customDisplayName} />
{av}
</div>
{ nameEl }
</div>

2
src/components/views/rooms/RoomHeader.js
View file

@ -264,7 +264,7 @@ module.exports = React.createClass({
else {
roomAvatar = (
<div onClick={this.props.onSettingsClick}>
<RoomAvatar room={this.props.room} width="48" height="48"/>
<RoomAvatar room={this.props.room} width={48} height={48}/>
</div>
);
}

2
src/components/views/rooms/RoomTile.js
View file

@ -123,7 +123,7 @@ module.exports = React.createClass({
return connectDragSource(connectDropTarget(
<div className={classes} onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
<div className="mx_RoomTile_avatar">
<RoomAvatar room={this.props.room} width="24" height="24" />
<RoomAvatar room={this.props.room} width={24} height={24} />
{ badge }
</div>
{ label }