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

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

@ -469,20 +469,23 @@ module.exports = React.createClass({
} }
}); });
var tagsSection = var tagsSection = null;
<div className="mx_RoomSettings_tags"> if (canSetTag || self.state.tags) {
{ canSetTag ? var tagsSection =
("Tagged as: " + tags.map(function(tag, i) { <div className="mx_RoomSettings_tags">
return (<label key={ i }> Tagged as: { canSetTag ?
<input type="checkbox" (tags.map(function(tag, i) {
ref={ tag.ref } return (<label key={ i }>
checked={ tag.name in self.state.tags } <input type="checkbox"
onChange={ self._onTagChange.bind(self, tag.name) }/> ref={ tag.ref }
{ tag.label } checked={ tag.name in self.state.tags }
</label>); onChange={ self._onTagChange.bind(self, tag.name) }/>
})) : (self.state.tags && self.state.tags.join) ? ("Tagged as: " +self.state.tags.join(", ")) : "" { tag.label }
} </label>);
</div> })) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : ""
}
</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