Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Make default avatars clickable #673

Merged
merged 3 commits into from
Feb 2, 2017
Merged

Make default avatars clickable #673

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7484cc3
Make default avatars clickable
dbkr Feb 2, 2017
10edab0
Don't c+p the complex markup
dbkr Feb 2, 2017
e7a32fa
Wrap multiline JSX in parens
dbkr Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions src/components/views/avatars/BaseAvatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,33 @@ module.exports = React.createClass({

if (imageUrl === this.state.defaultImageUrl) {
const initialLetter = this._getInitialLetter(name);
return (
<span className="mx_BaseAvatar" {...otherProps}>
<EmojiText className="mx_BaseAvatar_initial" aria-hidden="true"
style={{ fontSize: (width * 0.65) + "px",
width: width + "px",
lineHeight: height + "px" }}>{initialLetter}</EmojiText>
<img className="mx_BaseAvatar_image" src={imageUrl}
alt="" title={title} onError={this.onError}
width={width} height={height} />
</span>
);
const textNode = <EmojiText className="mx_BaseAvatar_initial" aria-hidden="true"
style={{ fontSize: (width * 0.65) + "px",
width: width + "px",
lineHeight: height + "px" }}
>
{initialLetter}
</EmojiText>;
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) {
return (
Expand Down