Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2017-10-26 13:52:20 +00:00
commit bd8097e44c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/structures/GroupView.js
View File

@ -964,13 +964,15 @@ export default React.createClass({
</AccessibleButton>, </AccessibleButton>,
); );
} else { } else {
rightButtons.push( if (summary.user && summary.user.membership === 'join') {
<AccessibleButton className="mx_GroupHeader_button" rightButtons.push(
onClick={this._onEditClick} title={_t("Community Settings")} key="_editButton" <AccessibleButton className="mx_GroupHeader_button"
> onClick={this._onEditClick} title={_t("Community Settings")} key="_editButton"
<TintableSvg src="img/icons-settings-room.svg" width="16" height="16" /> >
</AccessibleButton>, <TintableSvg src="img/icons-settings-room.svg" width="16" height="16" />
); </AccessibleButton>,
);
}
if (this.props.collapsedRhs) { if (this.props.collapsedRhs) {
rightButtons.push( rightButtons.push(
<AccessibleButton className="mx_GroupHeader_button" <AccessibleButton className="mx_GroupHeader_button"