treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix alt+enter changing visibility setting without sending toot when toot is empty

lolsob-rspec
Thibaut Girka 2020-02-14 20:19:35 +01:00 committed by ThibG
parent 7e23ce3cfc
commit 23bf32d2b5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/flavours/glitch/features/compose/components/compose_form.js
View File

@ -93,7 +93,7 @@ class ComposeForm extends ImmutablePureComponent {
} }
} }
handleSubmit = () => { handleSubmit = (overriddenVisibility = null) => {
const { textarea: { value }, uploadForm } = this; const { textarea: { value }, uploadForm } = this;
const { const {
onChange, onChange,
@ -106,6 +106,7 @@ class ComposeForm extends ImmutablePureComponent {
text, text,
mediaDescriptionConfirmation, mediaDescriptionConfirmation,
onMediaDescriptionConfirm, onMediaDescriptionConfirm,
onChangeVisibility,
} = this.props; } = this.props;
// If something changes inside the textarea, then we update the // If something changes inside the textarea, then we update the
@ -124,6 +125,9 @@ class ComposeForm extends ImmutablePureComponent {
const firstWithoutDescription = media.find(item => !item.get('description')); const firstWithoutDescription = media.find(item => !item.get('description'));
onMediaDescriptionConfirm(this.context.router ? this.context.router.history : null, firstWithoutDescription.get('id')); onMediaDescriptionConfirm(this.context.router ? this.context.router.history : null, firstWithoutDescription.get('id'));
} else if (onSubmit) { } else if (onSubmit) {
if (onChangeVisibility && overriddenVisibility) {
onChangeVisibility(overriddenVisibility);
}
onSubmit(this.context.router ? this.context.router.history : null); onSubmit(this.context.router ? this.context.router.history : null);
} }
} }
@ -152,13 +156,9 @@ class ComposeForm extends ImmutablePureComponent {
// Handles the secondary submit button. // Handles the secondary submit button.
handleSecondarySubmit = () => { handleSecondarySubmit = () => {
const { const {
onChangeVisibility,
sideArm, sideArm,
} = this.props; } = this.props;
if (sideArm !== 'none' && onChangeVisibility) { this.handleSubmit(sideArm === 'none' ? null : sideArm);
onChangeVisibility(sideArm);
}
this.handleSubmit();
} }
// Selects a suggestion from the autofill. // Selects a suggestion from the autofill.