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

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

Browse source
This commit is contained in:
David Baker 2016-03-22 12:59:14 +00:00
commit e311a963c1
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/room_settings/AliasSettings.js
View file

@ -289,6 +289,7 @@ module.exports = React.createClass({
); );
})} })}
{ this.props.canSetAliases ?
<div className="mx_RoomSettings_aliasesTableRow" key="new"> <div className="mx_RoomSettings_aliasesTableRow" key="new">
<EditableText <EditableText
ref="add_alias" ref="add_alias"
@ -301,7 +302,8 @@ module.exports = React.createClass({
<img src="img/plus.svg" width="14" height="14" alt="Add" <img src="img/plus.svg" width="14" height="14" alt="Add"
onClick={ self.onAliasAdded.bind(self, undefined) }/> onClick={ self.onAliasAdded.bind(self, undefined) }/>
</div> </div>
</div> </div> : ""
}
</div> </div>
{ remote_aliases_section } { remote_aliases_section }

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

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