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 13:54:31 +00:00
commit 098f3e6561
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -469,10 +469,12 @@ module.exports = React.createClass({
} }
}); });
var tagsSection = null;
if (canSetTag || self.state.tags) {
var tagsSection = var tagsSection =
<div className="mx_RoomSettings_tags"> <div className="mx_RoomSettings_tags">
{ canSetTag ? Tagged as: { canSetTag ?
("Tagged as: " + tags.map(function(tag, i) { (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 }
@ -480,9 +482,10 @@ 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) ? ("Tagged as: " +self.state.tags.join(", ")) : "" })) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : ""
} }
</div> </div>
}
// If there is no history_visibility, it is assumed to be 'shared'. // If there is no history_visibility, it is assumed to be 'shared'.
// http://matrix.org/docs/spec/r0.0.0/client_server.html#id31 // http://matrix.org/docs/spec/r0.0.0/client_server.html#id31