OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-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 13:54:31 +00:00
parent f1219a6b8d c60a305284
commit 098f3e6561
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,20 +469,23 @@ module.exports = React.createClass({
}
});
var tagsSection =
<div className="mx_RoomSettings_tags">
{ canSetTag ?
("Tagged as: " + tags.map(function(tag, i) {
return (<label key={ i }>
<input type="checkbox"
ref={ tag.ref }
checked={ tag.name in self.state.tags }
onChange={ self._onTagChange.bind(self, tag.name) }/>
{ tag.label }
</label>);
})) : (self.state.tags && self.state.tags.join) ? ("Tagged as: " +self.state.tags.join(", ")) : ""
}
</div>
var tagsSection = null;
if (canSetTag || self.state.tags) {
var tagsSection =
<div className="mx_RoomSettings_tags">
Tagged as: { canSetTag ?
(tags.map(function(tag, i) {
return (<label key={ i }>
<input type="checkbox"
ref={ tag.ref }
checked={ tag.name in self.state.tags }
onChange={ self._onTagChange.bind(self, tag.name) }/>
{ tag.label }
</label>);
})) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : ""
}
</div>
}
// If there is no history_visibility, it is assumed to be 'shared'.
// http://matrix.org/docs/spec/r0.0.0/client_server.html#id31