me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix attached media uploads not being cleared when replying to a post (#23504)

Browse source
This commit is contained in:
Claire 2023-02-10 22:03:35 +01:00 committed by GitHub
parent 71ae17e8f5
commit bae17ebe5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/features/compose/components/upload.js
View file

@ -31,6 +31,11 @@ export default class Upload extends ImmutablePureComponent {
render () { render () {
const { media } = this.props; const { media } = this.props;
if (!media) {
return null;
}
const focusX = media.getIn(['meta', 'focus', 'x']); const focusX = media.getIn(['meta', 'focus', 'x']);
const focusY = media.getIn(['meta', 'focus', 'y']); const focusY = media.getIn(['meta', 'focus', 'y']);
const x = ((focusX / 2) + .5) * 100; const x = ((focusX / 2) + .5) * 100;

2
app/javascript/mastodon/reducers/compose.js
View file

@ -330,6 +330,8 @@ export default function compose(state = initialState, action) {
map.set('preselectDate', new Date()); map.set('preselectDate', new Date());
map.set('idempotencyKey', uuid()); map.set('idempotencyKey', uuid());
map.update('media_attachments', list => list.filter(media => media.get('unattached')));
if (action.status.get('language') && !action.status.has('translation')) { if (action.status.get('language') && !action.status.has('translation')) {
map.set('language', action.status.get('language')); map.set('language', action.status.get('language'));
} else { } else {