OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix roomsettings a bit

pull/21833/head
Matthew Hodgson 2016-01-20 16:39:26 +00:00
parent 14c2d945d6
commit 76279e2940
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/rooms/RoomSettings.js
View File

@ -295,8 +295,8 @@ module.exports = React.createClass({
else { else {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Invalid alias format", title: "Invalid address format",
description: "'" + alias + "' is not a valid format for an alias", description: "'" + alias + "' is not a valid format for an address",
}); });
} }
}, },
@ -533,7 +533,8 @@ module.exports = React.createClass({
{ this.state.aliases[domain].map(function(alias, i) { { this.state.aliases[domain].map(function(alias, i) {
var deleteButton; var deleteButton;
if (can_set_room_aliases) { if (can_set_room_aliases) {
deleteButton = <img src="img/cancel-small.svg" width="14" height="14" alt="Delete" onClick={ self.onAliasDeleted.bind(self, domain, i) }/>; deleteButton = <img src="img/cancel-small.svg" width="14" height="14" alt="Delete"
onClick={ self.onAliasDeleted.bind(self, domain, i) }/>;
} }
return ( return (
<div className="mx_RoomSettings_aliasesTableRow" key={ i }> <div className="mx_RoomSettings_aliasesTableRow" key={ i }>
@ -561,7 +562,8 @@ module.exports = React.createClass({
blurToCancel={ false } blurToCancel={ false }
onValueChanged={ self.onAliasAdded } /> onValueChanged={ self.onAliasAdded } />
<div className="mx_RoomSettings_addAlias"> <div className="mx_RoomSettings_addAlias">
<img src="img/plus.svg" width="14" height="14" alt="Add" onClick={ self.onAliasAdded.bind(self, undefined) }/> <img src="img/plus.svg" width="14" height="14" alt="Add"
onClick={ self.onAliasAdded.bind(self, undefined) }/>
</div> </div>
</div> </div>
</div> </div>
@ -659,7 +661,7 @@ module.exports = React.createClass({
var tags_section = var tags_section =
<div className="mx_RoomSettings_tags"> <div className="mx_RoomSettings_tags">
This room is tagged as Tagged as:
{ can_set_tag ? { can_set_tag ?
tags.map(function(tag, i) { tags.map(function(tag, i) {
return (<label key={ i }> return (<label key={ i }>