mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-11-23 14:46:52 +09:00
Code

Fix clicking on avatar/display opening status instead of profile (#2897)

Browse Source 
Fix regression from #2895
This commit is contained in:
Claire 2024-11-11 16:11:24 +01:00 committed by GitHub
parent b7a66c6eac
commit 1ae5f84774
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/javascript/flavours/glitch/components/status.jsx
View File

@ -372,26 +372,29 @@ class Status extends ImmutablePureComponent {
const { isCollapsed } = this.state; const { isCollapsed } = this.state;
if (!history) return; if (!history) return;
if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey)) { if (e.button !== 0 || e.ctrlKey || e.altKey || e.metaKey) {
if (isCollapsed) this.setCollapsed(false); return;
else if (e.shiftKey) {
this.setCollapsed(true);
document.getSelection().removeAllRanges();
} else if (this.props.onClick) {
this.props.onClick();
return;
} else {
if (destination === undefined) {
destination = `/@${
status.getIn(['reblog', 'account', 'acct'], status.getIn(['account', 'acct']))
}/${
status.getIn(['reblog', 'id'], status.get('id'))
}`;
}
history.push(destination);
}
e.preventDefault();
} }
if (isCollapsed) this.setCollapsed(false);
else if (e.shiftKey) {
this.setCollapsed(true);
document.getSelection().removeAllRanges();
} else if (this.props.onClick) {
this.props.onClick();
return;
} else {
if (destination === undefined) {
destination = `/@${
status.getIn(['reblog', 'account', 'acct'], status.getIn(['account', 'acct']))
}/${
status.getIn(['reblog', 'id'], status.get('id'))
}`;
}
history.push(destination);
}
e.preventDefault();
}; };
handleToggleMediaVisibility = () => { handleToggleMediaVisibility = () => {

11
app/javascript/flavours/glitch/components/status_header.jsx
View File

@ -18,15 +18,10 @@ export default class StatusHeader extends PureComponent {
parseClick: PropTypes.func.isRequired, parseClick: PropTypes.func.isRequired,
}; };
// Handles clicks on account name/image
handleClick = (acct, e) => {
const { parseClick } = this.props;
parseClick(e, `/@${acct}`);
};
handleAccountClick = (e) => { handleAccountClick = (e) => {
const { status } = this.props; const { status, parseClick } = this.props;
this.handleClick(status.getIn(['account', 'acct']), e); parseClick(e, `/@${status.getIn(['account', 'acct'])}`);
e.stopPropagation();
}; };
// Rendering. // Rendering.