imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove change avatar from here as it's now in the header

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-15 15:50:38 +00:00
parent aefecfc645
commit 57e62bf0ba
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/rooms/RoomSettings.js
View file

@ -161,7 +161,6 @@ module.exports = React.createClass({
var EditableText = sdk.getComponent('elements.EditableText'); var EditableText = sdk.getComponent('elements.EditableText');
var PowerSelector = sdk.getComponent('elements.PowerSelector'); var PowerSelector = sdk.getComponent('elements.PowerSelector');
var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
var join_rule = this.props.room.currentState.getStateEvents('m.room.join_rules', ''); var join_rule = this.props.room.currentState.getStateEvents('m.room.join_rules', '');
if (join_rule) join_rule = join_rule.getContent().join_rule; if (join_rule) join_rule = join_rule.getContent().join_rule;
@ -319,15 +318,6 @@ module.exports = React.createClass({
</div> </div>
</div>; </div>;
var change_avatar;
if (can_set_room_avatar) {
change_avatar =
<div>
<h3>Room Icon</h3>
<ChangeAvatar room={this.props.room} />
</div>;
}
var user_levels_section; var user_levels_section;
if (user_levels.length) { if (user_levels.length) {
user_levels_section = user_levels_section =
@ -369,7 +359,7 @@ module.exports = React.createClass({
var create_event = this.props.room.currentState.getStateEvents('m.room.create', ''); var create_event = this.props.room.currentState.getStateEvents('m.room.create', '');
var unfederatable_section; var unfederatable_section;
if (create_event.getContent()["m.federate"] === false) { if (create_event.getContent()["m.federate"] === false) {
unfederatable_section = <div>Ths room is not accessible by remote Matrix servers</div>. unfederatable_section = <div>Ths room is not accessible by remote Matrix servers.</div>
} }
// TODO: support editing custom events_levels // TODO: support editing custom events_levels
@ -447,8 +437,6 @@ module.exports = React.createClass({
{ banned_users_section } { banned_users_section }
{ change_avatar }
</div> </div>
); );
} }