Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
mastofe
Commits
db136f95
Verified
Commit
db136f95
authored
Mar 30, 2018
by
Morgan Bazalgette
Browse files
Get charLimit from the initial state
parent
e3cc42e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/javascript/mastodon/features/compose/components/compose_form.js
View file @
db136f95
...
...
@@ -18,6 +18,7 @@ import { isMobile } from '../../../is_mobile';
import
ImmutablePureComponent
from
'
react-immutable-pure-component
'
;
import
{
length
}
from
'
stringz
'
;
import
{
countableText
}
from
'
../util/counter
'
;
import
{
charLimit
}
from
"
../../../initial_state
"
const
messages
=
defineMessages
({
placeholder
:
{
id
:
'
compose_form.placeholder
'
,
defaultMessage
:
'
What is on your mind?
'
},
...
...
@@ -146,7 +147,7 @@ export default class ComposeForm extends ImmutablePureComponent {
const
{
intl
,
onPaste
,
showSearch
,
anyMedia
}
=
this
.
props
;
const
disabled
=
this
.
props
.
is_submitting
;
const
text
=
[
this
.
props
.
spoiler_text
,
countableText
(
this
.
props
.
text
)].
join
(
''
);
const
disabledButton
=
disabled
||
this
.
props
.
is_uploading
||
length
(
text
)
>
500
||
(
text
.
length
!==
0
&&
text
.
trim
().
length
===
0
&&
!
anyMedia
);
const
disabledButton
=
disabled
||
this
.
props
.
is_uploading
||
length
(
text
)
>
charLimit
||
(
text
.
length
!==
0
&&
text
.
trim
().
length
===
0
&&
!
anyMedia
);
let
publishText
=
''
;
if
(
this
.
props
.
privacy
===
'
private
'
||
this
.
props
.
privacy
===
'
direct
'
)
{
...
...
@@ -200,7 +201,7 @@ export default class ComposeForm extends ImmutablePureComponent {
<
SensitiveButtonContainer
/>
<
SpoilerButtonContainer
/>
<
/div
>
<
div
className
=
'
character-counter__wrapper
'
><
CharacterCounter
max
=
{
500
}
text
=
{
text
}
/></
div
>
<
div
className
=
'
character-counter__wrapper
'
><
CharacterCounter
max
=
{
charLimit
}
text
=
{
text
}
/></
div
>
<
/div
>
<
div
className
=
'
compose-form__publish
'
>
...
...
app/javascript/mastodon/initial_state.js
View file @
db136f95
...
...
@@ -11,5 +11,6 @@ export const boostModal = getMeta('boost_modal');
export
const
deleteModal
=
getMeta
(
'
delete_modal
'
);
export
const
me
=
getMeta
(
'
me
'
);
export
const
searchEnabled
=
getMeta
(
'
search_enabled
'
);
export
const
charLimit
=
getMeta
(
'
char_limit
'
)
||
5000
;
export
default
initialState
;
Morgan Bazalgette
@tyge
mentioned in merge request
pleroma!86 (merged)
·
Mar 29, 2018
mentioned in merge request
pleroma!86 (merged)
mentioned in merge request pleroma/pleroma!86
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment