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

Make default avatars clickable

src/components/views/avatars/BaseAvatar.js

@@ -145,18 +145,38 @@ module.exports = React.createClass({
 
         if (imageUrl === this.state.defaultImageUrl) {
             const initialLetter = this._getInitialLetter(name);
-            return (
+            const textNode = (
-                <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>
+                    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 (
                 <AccessibleButton className="mx_BaseAvatar mx_BaseAvatar_image"