Fix encryption badge layouts and replies.

Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
This commit is contained in:
Jorik Schellekens 2020-05-07 13:55:23 +01:00
parent 5568e6488d
commit 771ae5e18f
7 changed files with 69 additions and 18 deletions

View file

@ -209,6 +209,9 @@ export default createReactClass({
// whether to use the irc layout
useIRCLayout: PropTypes.bool,
// whether to display avatars
displayAvatars: PropTypes.bool,
},
getDefaultProps: function() {
@ -713,7 +716,7 @@ export default createReactClass({
needsSenderProfile = true;
}
if (this.props.mxEvent.sender && avatarSize) {
if (this.props.mxEvent.sender && avatarSize && this.props.displayAvatars) {
avatar = (
<div className="mx_EventTile_avatar">
<MemberAvatar member={this.props.mxEvent.sender}
@ -897,6 +900,7 @@ export default createReactClass({
this.props.permalinkCreator,
this._replyThread,
this.props.useIRCLayout,
this.props.displayAvatars,
);
// tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers