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

Merge branch 'develop' into kegan/invite-search

Browse source
This commit is contained in:
Kegan Dougal 2016-01-18 17:31:26 +00:00
commit 0465323ca6
21 changed files with 1425 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ module.exports = React.createClass({
},
getPowerLabel: function() {
return this.props.member.userId;
return this.props.member.userId + " (power " + this.props.member.powerLevel + ")";
},
render: function() {
@ -79,6 +79,14 @@ module.exports = React.createClass({
var av = (
<MemberAvatar member={member} width={36} height={36} />
);
var power;
var powerLevel = this.props.member.powerLevel;
if (powerLevel >= 50 && powerLevel < 99) {
power = <img src="img/mod.svg" className="mx_MemberTile_power" width="16" height="17" alt="Mod"/>;
}
if (powerLevel >= 99) {
power = <img src="img/admin.svg" className="mx_MemberTile_power" width="16" height="17" alt="Admin"/>;
}
if (member.user) {
this.user_last_modified_time = member.user.getLastModifiedTime();
@ -94,7 +102,7 @@ module.exports = React.createClass({
<EntityTile {...this.props} presenceActiveAgo={active} presenceState={presenceState}
avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
shouldComponentUpdate={this.shouldComponentUpdate.bind(this)}
name={name} />
name={name} powerLevel={this.props.member.powerLevel} />
);
}
});