AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 4 Pull requests Projects Releases Wiki Activity

fixup: Remove countableText to count all text

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2018-12-21 15:21:46 +01:00
parent b103ce3159
commit 4186c5385c
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,13 +160,8 @@ class ComposeForm extends ImmutablePureComponent {
render () {
const { intl, onPaste, showSearch, anyMedia } = this.props;
const disabled = this.props.is_submitting;
<<<<<<< HEAD
const text = [this.props.spoiler_text, countableText(this.props.text)].join('');
const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
=======
const text = [this.props.spoiler_text, this.props.text].join('');
const disabledButton = disabled || this.props.is_uploading || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
>>>>>>> ed08e721e... Remove countableText to count all text
const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
let publishText = '';
if (this.props.privacy === 'private' || this.props.privacy === 'direct') {