Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add editing for published statuses (#17320)

Browse source 
* Add editing for published statuses

* Fix change of multiple-choice boolean in poll not resetting votes

* Remove the ability to update existing media attachments for now
This commit is contained in:
Eugen Rochko 2022-02-10 00:15:30 +01:00 • committed by GitHub
parent 20a3564ab2
commit 63002cde03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 839 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/features/compose/containers/compose_form_container.js
View file

@ -21,6 +21,7 @@ const mapStateToProps = state => ({
caretPosition: state.getIn(['compose', 'caretPosition']),
preselectDate: state.getIn(['compose', 'preselectDate']),
isSubmitting: state.getIn(['compose', 'is_submitting']),
isEditing: state.getIn(['compose', 'id']) !== null,
isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
isUploading: state.getIn(['compose', 'is_uploading']),
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),

17
app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
View file

@ -6,9 +6,20 @@ import ReplyIndicator from '../components/reply_indicator';
const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
const mapStateToProps = state => ({
status: getStatus(state, { id: state.getIn(['compose', 'in_reply_to']) }),
});
const mapStateToProps = state => {
let statusId = state.getIn(['compose', 'id'], null);
let editing = true;
if (statusId === null) {
statusId = state.getIn(['compose', 'in_reply_to']);
editing = false;
}
return {
status: getStatus(state, { id: statusId }),
editing,
};
};
return mapStateToProps;
};