gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

#24 Fix editing circle post icon

Browse source
This commit is contained in:
KMY 2023-09-26 18:05:58 +09:00
parent 13c51133d3
commit 28ab1ca973
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/components/compose_form.jsx
View file

@ -103,11 +103,11 @@ class ComposeForm extends ImmutablePureComponent {
}; };
canSubmit = () => { canSubmit = () => {
const { isSubmitting, isChangingUpload, isUploading, anyMedia, privacy, circleId } = this.props; const { isSubmitting, isChangingUpload, isUploading, anyMedia, privacy, circleId, isEditing } = this.props;
const fulltext = this.getFulltextForCharacterCounting(); const fulltext = this.getFulltextForCharacterCounting();
const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0; const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia) || (privacy === 'circle' && !circleId)); return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia) || (privacy === 'circle' && !isEditing && !circleId));
}; };
handleSubmit = (e) => { handleSubmit = (e) => {

2
app/javascript/mastodon/features/compose/containers/circle_select_container.js
View file

@ -4,7 +4,7 @@ import { changeCircle } from '../../../actions/compose';
import CircleSelect from '../components/circle_select'; import CircleSelect from '../components/circle_select';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
unavailable: state.getIn(['compose', 'privacy']) !== 'circle', unavailable: state.getIn(['compose', 'privacy']) !== 'circle' || !!state.getIn(['compose', 'id']),
circles: state.get('circles'), circles: state.get('circles'),
circleId: state.getIn(['compose', 'circle_id']), circleId: state.getIn(['compose', 'circle_id']),
}); });

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

@ -577,7 +577,11 @@ export default function compose(state = initialState, action) {
map.set('id', action.status.get('id')); map.set('id', action.status.get('id'));
map.set('text', action.text); map.set('text', action.text);
map.set('in_reply_to', action.status.get('in_reply_to_id')); map.set('in_reply_to', action.status.get('in_reply_to_id'));
map.set('privacy', action.status.get('visibility_ex')); if (action.status.get('visibility_ex') !== 'limited') {
map.set('privacy', action.status.get('visibility_ex'));
} else {
map.set('privacy', action.status.get('limited_scope') === 'mutual' ? 'mutual' : 'circle');
}
map.set('media_attachments', action.status.get('media_attachments')); map.set('media_attachments', action.status.get('media_attachments'));
map.set('focusDate', new Date()); map.set('focusDate', new Date());
map.set('caretPosition', null); map.set('caretPosition', null);