sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Count spoiler text in the character count. Fixes #135.

This commit is contained in:
Roger Braun 2018-11-07 17:20:33 +01:00
parent 2f11ec296e
commit 6f668df697
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/post_status_form/post_status_form.js
View File

@ -53,7 +53,7 @@ const PostStatusForm = {
posting: false, posting: false,
highlighted: 0, highlighted: 0,
newStatus: { newStatus: {
spoilerText: this.subject, spoilerText: this.subject || '',
status: statusText, status: statusText,
contentType: 'text/plain', contentType: 'text/plain',
nsfw: false, nsfw: false,
@ -128,6 +128,9 @@ const PostStatusForm = {
statusLength () { statusLength () {
return this.newStatus.status.length return this.newStatus.status.length
}, },
spoilerTextLength () {
return this.newStatus.spoilerText.length
},
statusLengthLimit () { statusLengthLimit () {
return this.$store.state.instance.textlimit return this.$store.state.instance.textlimit
}, },
@ -135,10 +138,10 @@ const PostStatusForm = {
return this.statusLengthLimit > 0 return this.statusLengthLimit > 0
}, },
charactersLeft () { charactersLeft () {
return this.statusLengthLimit - this.statusLength return this.statusLengthLimit - (this.statusLength + this.spoilerTextLength)
}, },
isOverLengthLimit () { isOverLengthLimit () {
return this.hasStatusLengthLimit && (this.statusLength > this.statusLengthLimit) return this.hasStatusLengthLimit && (this.charactersLeft < 0)
}, },
scopeOptionsEnabled () { scopeOptionsEnabled () {
return this.$store.state.instance.scopeOptionsEnabled return this.$store.state.instance.scopeOptionsEnabled