tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

[Glitch] Fix character count not ignoring hidden CW field

Browse Source 
Port 68775b6039 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Mélanie Chauvel 2020-11-30 12:09:34 +01:00 committed by Claire
parent f8d867bac4
commit 40e2de3904
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import Publisher from './publisher';
import TextareaIcons from './textarea_icons';
import { maxChars } from 'flavours/glitch/util/initial_state';
import CharacterCounter from './character_counter';
import { length } from 'stringz';
const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
@ -81,30 +82,37 @@ class ComposeForm extends ImmutablePureComponent {
this.props.onChange(e.target.value);
}
getFulltextForCharacterCounting = () => {
return [
this.props.spoiler? this.props.spoilerText: '',
countableText(this.props.text),
this.props.advancedOptions && this.props.advancedOptions.get('do_not_federate') ? ' 👁️' : ''
].join('');
}
canSubmit = () => {
const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
const fulltext = this.getFulltextForCharacterCounting();
return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (!fulltext.trim().length && !anyMedia));
}
handleSubmit = (overriddenVisibility = null) => {
const { textarea: { value }, uploadForm } = this;
const {
onChange,
onSubmit,
isSubmitting,
isChangingUpload,
isUploading,
media,
anyMedia,
text,
mediaDescriptionConfirmation,
onMediaDescriptionConfirm,
onChangeVisibility,
} = this.props;
// If something changes inside the textarea, then we update the
// state before submitting.
if (onChange && text !== value) {
onChange(value);
if (this.props.text !== this.textarea.value) {
// Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
// Update the state to match the current text
this.props.onChange(this.textarea.value);
}
// Submit disabled:
if (isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia)) {
if (!this.canSubmit()) {
return;
}
@ -260,13 +268,9 @@ class ComposeForm extends ImmutablePureComponent {
} = this;
const {
advancedOptions,
anyMedia,
intl,
isSubmitting,
isChangingUpload,
isUploading,
layout,
media,
onChangeSpoilerness,
onChangeVisibility,
onClearSuggestions,
@ -279,13 +283,10 @@ class ComposeForm extends ImmutablePureComponent {
spoiler,
spoilerText,
suggestions,
text,
spoilersAlwaysOn,
} = this.props;
let disabledButton = isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia);
const countText = `${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 👁️' : ''}`;
const countText = this.getFulltextForCharacterCounting();
return (
<div className='composer'>
@ -353,7 +354,7 @@ class ComposeForm extends ImmutablePureComponent {
<Publisher
countText={countText}
disabled={disabledButton}
disabled={!this.canSubmit()}
onSecondarySubmit={handleSecondarySubmit}
onSubmit={handleSubmit}
privacy={privacy}