mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 22:14:58 +08:00
Merge pull request #1454 from matrix-org/t3chguy/jump_to_rr
Add a way to jump to a user's Read Receipt from MemberInfo
This commit is contained in:
commit
b552b45a96
@ -625,22 +625,49 @@ module.exports = withMatrixClient(React.createClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
_renderUserOptions: function() {
|
_renderUserOptions: function() {
|
||||||
// Only allow the user to ignore the user if its not ourselves
|
const cli = this.props.matrixClient;
|
||||||
|
const member = this.props.member;
|
||||||
|
|
||||||
let ignoreButton = null;
|
let ignoreButton = null;
|
||||||
if (this.props.member.userId !== this.props.matrixClient.getUserId()) {
|
let readReceiptButton = null;
|
||||||
|
|
||||||
|
// Only allow the user to ignore the user if its not ourselves
|
||||||
|
// same goes for jumping to read receipt
|
||||||
|
if (member.userId !== cli.getUserId()) {
|
||||||
ignoreButton = (
|
ignoreButton = (
|
||||||
<AccessibleButton onClick={this.onIgnoreToggle} className="mx_MemberInfo_field">
|
<AccessibleButton onClick={this.onIgnoreToggle} className="mx_MemberInfo_field">
|
||||||
{ this.state.isIgnoring ? _t("Unignore") : _t("Ignore") }
|
{ this.state.isIgnoring ? _t("Unignore") : _t("Ignore") }
|
||||||
</AccessibleButton>
|
</AccessibleButton>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (member.roomId) {
|
||||||
|
const room = cli.getRoom(member.roomId);
|
||||||
|
const eventId = room.getEventReadUpTo(member.userId);
|
||||||
|
|
||||||
|
const onReadReceiptButton = function() {
|
||||||
|
dis.dispatch({
|
||||||
|
action: 'view_room',
|
||||||
|
highlighted: true,
|
||||||
|
event_id: eventId,
|
||||||
|
room_id: member.roomId,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
readReceiptButton = (
|
||||||
|
<AccessibleButton onClick={onReadReceiptButton} className="mx_MemberInfo_field">
|
||||||
|
{ _t('Jump to read receipt') }
|
||||||
|
</AccessibleButton>
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ignoreButton) return null;
|
if (!ignoreButton && !readReceiptButton) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<h3>{ _t("User Options") }</h3>
|
<h3>{ _t("User Options") }</h3>
|
||||||
<div className="mx_MemberInfo_buttons">
|
<div className="mx_MemberInfo_buttons">
|
||||||
|
{ readReceiptButton }
|
||||||
{ ignoreButton }
|
{ ignoreButton }
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -252,6 +252,7 @@
|
|||||||
"%(targetName)s joined the room.": "%(targetName)s joined the room.",
|
"%(targetName)s joined the room.": "%(targetName)s joined the room.",
|
||||||
"Joins room with given alias": "Joins room with given alias",
|
"Joins room with given alias": "Joins room with given alias",
|
||||||
"Jump to first unread message.": "Jump to first unread message.",
|
"Jump to first unread message.": "Jump to first unread message.",
|
||||||
|
"Jump to read receipt": "Jump to read receipt",
|
||||||
"%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
|
"%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
|
||||||
"Kick": "Kick",
|
"Kick": "Kick",
|
||||||
"Kicks user with given id": "Kicks user with given id",
|
"Kicks user with given id": "Kicks user with given id",
|
||||||
|
Loading…
Reference in New Issue
Block a user