matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Show User avatar URLs

Browse Source
This commit is contained in:
Kegan Dougal
2016-01-15 17:31:32 +00:00
parent 4d47d9875b
commit d6c7631dcc
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/MemberTile.js
View File

@@ -156,7 +156,7 @@ module.exports = React.createClass({
var av;
if (member) {
av = (
<MemberAvatar member={this.props.member} width={36} height={36} />
<MemberAvatar member={member} width={36} height={36} />
);
}
else {

7
src/components/views/rooms/UserTile.js
View File

@@ -18,6 +18,7 @@ limitations under the License.
var React = require('react');
var Avatar = require("../../../Avatar");
var MatrixClientPeg = require('../../../MatrixClientPeg');
var sdk = require('../../../index');
var dis = require('../../../dispatcher');
@@ -106,7 +107,7 @@ module.exports = React.createClass({
);
}
var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
if (this.props.showInvite) {
// TODO
@@ -117,8 +118,8 @@ module.exports = React.createClass({
onClick={ this.props.onClick } onMouseEnter={ this.mouseEnter }
onMouseLeave={ this.mouseLeave }>
<div className="mx_MemberTile_avatar">
<MemberAvatar member={null} width={36} height={36}
customDisplayName={name} />
<BaseAvatar width={36} height={36} name={name} idName={user.userId}
url={ Avatar.avatarUrlForUser(user, 36, 36, "crop") } />
</div>
{ nameEl }
</div>