PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #177 from Half-Shot/develop

Browse source 
Fixed default avatars not working with unicode.
This commit is contained in:
David Baker 2016-02-25 16:28:21 +00:00
commit d9e58d9626
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/avatars/BaseAvatar.js
View file

@ -101,9 +101,11 @@ module.exports = React.createClass({
_getInitialLetter: function() { _getInitialLetter: function() {
var name = this.props.name; var name = this.props.name;
var initial = name[0]; //For large characters (exceeding 2 bytes), this function will get the correct character.
//However, this does NOT get the second character correctly if a large character is before it.
var initial = String.fromCodePoint(name.codePointAt(0));
if ((initial === '@' || initial === '#') && name[1]) { if ((initial === '@' || initial === '#') && name[1]) {
initial = name[1]; initial = String.fromCodePoint(name.codePointAt(1));
} }
return initial.toUpperCase(); return initial.toUpperCase();
}, },
@ -127,7 +129,7 @@ module.exports = React.createClass({
title={this.props.title} onError={this.onError} title={this.props.title} onError={this.onError}
width={this.props.width} height={this.props.height} /> width={this.props.width} height={this.props.height} />
</span> </span>
); );
} }
return ( return (
<img className="mx_BaseAvatar mx_BaseAvatar_image" src={imageUrl} <img className="mx_BaseAvatar mx_BaseAvatar_image" src={imageUrl}