Show User avatar URLs
This commit is contained in:
parent
4d47d9875b
commit
d6c7631dcc
3 changed files with 17 additions and 5 deletions
|
@ -15,7 +15,7 @@ limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
var ContentRepo = require("matrix-js-sdk").ContentRepo;
|
||||||
var MatrixClientPeg = require('./MatrixClientPeg');
|
var MatrixClientPeg = require('./MatrixClientPeg');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
@ -37,6 +37,17 @@ module.exports = {
|
||||||
return url;
|
return url;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
avatarUrlForUser: function(user, width, height, resizeMethod) {
|
||||||
|
var url = ContentRepo.getHttpUriForMxc(
|
||||||
|
MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
|
||||||
|
width, height, resizeMethod
|
||||||
|
);
|
||||||
|
if (!url || url.length === 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return url;
|
||||||
|
},
|
||||||
|
|
||||||
defaultAvatarUrlForString: function(s) {
|
defaultAvatarUrlForString: function(s) {
|
||||||
var images = [ '76cfa6', '50e2c2', 'f4c371' ];
|
var images = [ '76cfa6', '50e2c2', 'f4c371' ];
|
||||||
var total = 0;
|
var total = 0;
|
||||||
|
|
|
@ -156,7 +156,7 @@ module.exports = React.createClass({
|
||||||
var av;
|
var av;
|
||||||
if (member) {
|
if (member) {
|
||||||
av = (
|
av = (
|
||||||
<MemberAvatar member={this.props.member} width={36} height={36} />
|
<MemberAvatar member={member} width={36} height={36} />
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -18,6 +18,7 @@ limitations under the License.
|
||||||
|
|
||||||
var React = require('react');
|
var React = require('react');
|
||||||
|
|
||||||
|
var Avatar = require("../../../Avatar");
|
||||||
var MatrixClientPeg = require('../../../MatrixClientPeg');
|
var MatrixClientPeg = require('../../../MatrixClientPeg');
|
||||||
var sdk = require('../../../index');
|
var sdk = require('../../../index');
|
||||||
var dis = require('../../../dispatcher');
|
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) {
|
if (this.props.showInvite) {
|
||||||
// TODO
|
// TODO
|
||||||
|
@ -117,8 +118,8 @@ module.exports = React.createClass({
|
||||||
onClick={ this.props.onClick } onMouseEnter={ this.mouseEnter }
|
onClick={ this.props.onClick } onMouseEnter={ this.mouseEnter }
|
||||||
onMouseLeave={ this.mouseLeave }>
|
onMouseLeave={ this.mouseLeave }>
|
||||||
<div className="mx_MemberTile_avatar">
|
<div className="mx_MemberTile_avatar">
|
||||||
<MemberAvatar member={null} width={36} height={36}
|
<BaseAvatar width={36} height={36} name={name} idName={user.userId}
|
||||||
customDisplayName={name} />
|
url={ Avatar.avatarUrlForUser(user, 36, 36, "crop") } />
|
||||||
</div>
|
</div>
|
||||||
{ nameEl }
|
{ nameEl }
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue