diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-17 14:28:16 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-17 14:28:16 -0600 |
| commit | dc16d73bf5f3e7db54e4f21848f40cff3d9172ca (patch) | |
| tree | fedca9297462bcf7419331c4498c34242385da23 /app/javascript | |
| parent | b006bb82afb360d64e9d2f7f12aa76d4a69a2397 (diff) | |
| parent | ca5440b93df514659eacde4ce562e459643dedc3 (diff) | |
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 13a41f23f..aaca45493 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -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 ? |