PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Respect user preference for whether pills should have an avatar or not

Browse source
This commit is contained in:
Michael Telatynski 2020-09-02 17:26:23 +01:00
parent 129b9459a3
commit beb77799f6
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/elements/ReplyThread.js
View file

@ -331,8 +331,14 @@ export default class ReplyThread extends React.Component {
{ {
_t('<a>In reply to</a> <pill>', {}, { _t('<a>In reply to</a> <pill>', {}, {
'a': (sub) => <a onClick={this.onQuoteClick} className="mx_ReplyThread_show">{ sub }</a>, 'a': (sub) => <a onClick={this.onQuoteClick} className="mx_ReplyThread_show">{ sub }</a>,
'pill': <Pill type={Pill.TYPE_USER_MENTION} room={room} 'pill': (
url={makeUserPermalink(ev.getSender())} shouldShowPillAvatar={true} />, <Pill
type={Pill.TYPE_USER_MENTION}
room={room}
url={makeUserPermalink(ev.getSender())}
shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
/>
),
}) })
} }
</blockquote>; </blockquote>;

5
src/components/views/settings/BridgeTile.js
View file

@ -24,6 +24,7 @@ import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
import BaseAvatar from "../avatars/BaseAvatar"; import BaseAvatar from "../avatars/BaseAvatar";
import AccessibleButton from "../elements/AccessibleButton"; import AccessibleButton from "../elements/AccessibleButton";
import {replaceableComponent} from "../../../utils/replaceableComponent"; import {replaceableComponent} from "../../../utils/replaceableComponent";
import SettingsStore from "../../../settings/SettingsStore";
@replaceableComponent("views.settings.BridgeTile") @replaceableComponent("views.settings.BridgeTile")
export default class BridgeTile extends React.PureComponent { export default class BridgeTile extends React.PureComponent {
@ -56,7 +57,7 @@ export default class BridgeTile extends React.PureComponent {
type={Pill.TYPE_USER_MENTION} type={Pill.TYPE_USER_MENTION}
room={this.props.room} room={this.props.room}
url={makeUserPermalink(content.creator)} url={makeUserPermalink(content.creator)}
shouldShowPillAvatar={true} shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
/>, />,
}); });
} }
@ -66,7 +67,7 @@ export default class BridgeTile extends React.PureComponent {
type={Pill.TYPE_USER_MENTION} type={Pill.TYPE_USER_MENTION}
room={this.props.room} room={this.props.room}
url={makeUserPermalink(this.props.ev.getSender())} url={makeUserPermalink(this.props.ev.getSender())}
shouldShowPillAvatar={true} shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
/>, />,
}); });