OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #673 from matrix-org/dbkr/make_default_avatars_clickable 

Make default avatars clickable
pull/21833/head
Richard van der Hoff 2017-02-02 18:49:08 +00:00 committed by GitHub
parent 8799891e0e e7a32faf64
commit cd5a1abfac
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/components/views/avatars/BaseAvatar.js
View File

@ -145,17 +145,37 @@ module.exports = React.createClass({
if (imageUrl === this.state.defaultImageUrl) { if (imageUrl === this.state.defaultImageUrl) {
const initialLetter = this._getInitialLetter(name); const initialLetter = this._getInitialLetter(name);
return ( const textNode = (
<span className="mx_BaseAvatar" {...otherProps}> <EmojiText className="mx_BaseAvatar_initial" aria-hidden="true"
<EmojiText className="mx_BaseAvatar_initial" aria-hidden="true" style={{ fontSize: (width * 0.65) + "px",
style={{ fontSize: (width * 0.65) + "px", width: width + "px",
width: width + "px", lineHeight: height + "px" }}
lineHeight: height + "px" }}>{initialLetter}</EmojiText> >
<img className="mx_BaseAvatar_image" src={imageUrl} {initialLetter}
alt="" title={title} onError={this.onError} </EmojiText>
width={width} height={height} />
</span>
); );
const imgNode = (
<img className="mx_BaseAvatar_image" src={imageUrl}
alt="" title={title} onError={this.onError}
width={width} height={height} />
);
if (onClick != null) {
return (
<AccessibleButton element='span' className="mx_BaseAvatar"
onClick={onClick} {...otherProps}
>
{textNode}
{imgNode}
</AccessibleButton>
);
} else {
return (
<span className="mx_BaseAvatar" {...otherProps}>
{textNode}
{imgNode}
</span>
);
}
} }
if (onClick != null) { if (onClick != null) {
return ( return (