Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size

Browse source
This commit is contained in:
David Yip 2017-11-17 14:28:16 -06:00
commit dc16d73bf5
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -19,6 +19,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { length } from 'stringz';
import { countableText } from '../util/counter';
import ComposeAttachOptions from '../../../../glitch/components/compose/attach_options/index';
import initialState from '../../../initial_state';
const maxChars = initialState.max_toot_chars;
const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
@ -205,7 +208,7 @@ export default class ComposeForm extends ImmutablePureComponent {
}
}
const submitDisabled = disabled || this.props.is_uploading || length(text) > 500 || (text.length !== 0 && text.trim().length === 0);
const submitDisabled = disabled || this.props.is_uploading || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0);
return (
<div className='compose-form'>
@ -255,7 +258,7 @@ export default class ComposeForm extends ImmutablePureComponent {
</div>
<div className='compose-form__publish'>
<div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
<div className='character-counter__wrapper'><CharacterCounter max={maxChars} text={text} /></div>
<div className='compose-form__publish-button-wrapper'>
{
showSideArm ?