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

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

pull/21833/head
David Baker 2016-03-22 12:59:14 +00:00
parent 30b76d372c 385e1ca1fb
commit e311a963c1
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/views/room_settings/AliasSettings.js
View File

@ -289,19 +289,21 @@ module.exports = React.createClass({
);
})}
<div className="mx_RoomSettings_aliasesTableRow" key="new">
<EditableText
ref="add_alias"
className="mx_RoomSettings_alias mx_RoomSettings_editable"
placeholderClassName="mx_RoomSettings_aliasPlaceholder"
placeholder={ "New address (e.g. #foo:" + localDomain + ")" }
blurToCancel={ false }
onValueChanged={ self.onAliasAdded } />
<div className="mx_RoomSettings_addAlias">
<img src="img/plus.svg" width="14" height="14" alt="Add"
onClick={ self.onAliasAdded.bind(self, undefined) }/>
</div>
</div>
{ this.props.canSetAliases ?
<div className="mx_RoomSettings_aliasesTableRow" key="new">
<EditableText
ref="add_alias"
className="mx_RoomSettings_alias mx_RoomSettings_editable"
placeholderClassName="mx_RoomSettings_aliasPlaceholder"
placeholder={ "New address (e.g. #foo:" + localDomain + ")" }
blurToCancel={ false }
onValueChanged={ self.onAliasAdded } />
<div className="mx_RoomSettings_addAlias">
<img src="img/plus.svg" width="14" height="14" alt="Add"
onClick={ self.onAliasAdded.bind(self, undefined) }/>
</div>
</div> : ""
}
</div>
{ remote_aliases_section }

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

@ -471,9 +471,8 @@ module.exports = React.createClass({
var tagsSection =
<div className="mx_RoomSettings_tags">
Tagged as:
{ canSetTag ?
tags.map(function(tag, i) {
("Tagged as: " + tags.map(function(tag, i) {
return (<label key={ i }>
<input type="checkbox"
ref={ tag.ref }
@ -481,7 +480,7 @@ module.exports = React.createClass({
onChange={ self._onTagChange.bind(self, tag.name) }/>
{ tag.label }
</label>);
}) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : "None"
})) : (self.state.tags && self.state.tags.join) ? ("Tagged as: " +self.state.tags.join(", ")) : ""
}
</div>