Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
7c7cf2714b
2 changed files with 6 additions and 8 deletions
|
@ -110,7 +110,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
let idx = 0;
|
let idx = 0;
|
||||||
const initial = name[0];
|
const initial = name[0];
|
||||||
if ((initial === '@' || initial === '#') && name[1]) {
|
if ((initial === '@' || initial === '#' || initial === '+') && name[1]) {
|
||||||
idx++;
|
idx++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,19 +38,17 @@ export default React.createClass({
|
||||||
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
|
const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
|
||||||
const EmojiText = sdk.getComponent('elements.EmojiText');
|
const EmojiText = sdk.getComponent('elements.EmojiText');
|
||||||
|
|
||||||
const av = (
|
const groupName = this.props.group.name || this.props.group.groupId;
|
||||||
<BaseAvatar name={this.props.group.name} width={24} height={24}
|
|
||||||
url={this.props.group.avatarUrl}
|
const av = <BaseAvatar name={groupName} width={24} height={24} url={this.props.group.avatarUrl} />;
|
||||||
/>
|
|
||||||
);
|
|
||||||
|
|
||||||
const label = <EmojiText
|
const label = <EmojiText
|
||||||
element="div"
|
element="div"
|
||||||
title={this.props.group.name}
|
title={groupName}
|
||||||
className="mx_GroupInviteTile_name"
|
className="mx_GroupInviteTile_name"
|
||||||
dir="auto"
|
dir="auto"
|
||||||
>
|
>
|
||||||
{ this.props.group.name }
|
{ groupName }
|
||||||
</EmojiText>;
|
</EmojiText>;
|
||||||
|
|
||||||
const badge = <div className="mx_GroupInviteTile_badge">!</div>;
|
const badge = <div className="mx_GroupInviteTile_badge">!</div>;
|
||||||
|
|
Loading…
Reference in a new issue