sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-24 00:45:28 +01:00
Code Issues Releases Wiki Activity

Merge branch '153-count-cw' into 'develop'

Browse Source 
Resolve "PleromaFE does not count the Content Warning into Post length"

Closes #153 and #135

See merge request pleroma/pleroma-fe!371
This commit is contained in:
lambda 2018-11-07 22:15:47 +00:00
commit a1962a610a
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,
highlighted: 0,
newStatus: {
spoilerText: this.subject,
spoilerText: this.subject || '',
status: statusText,
contentType: 'text/plain',
nsfw: false,
@ -128,6 +128,9 @@ const PostStatusForm = {
statusLength () {
return this.newStatus.status.length
},
spoilerTextLength () {
return this.newStatus.spoilerText.length
},
statusLengthLimit () {
return this.$store.state.instance.textlimit
},
@ -135,10 +138,10 @@ const PostStatusForm = {
return this.statusLengthLimit > 0
},
charactersLeft () {
return this.statusLengthLimit - this.statusLength
return this.statusLengthLimit - (this.statusLength + this.spoilerTextLength)
},
isOverLengthLimit () {
return this.hasStatusLengthLimit && (this.statusLength > this.statusLengthLimit)
return this.hasStatusLengthLimit && (this.charactersLeft < 0)
},
scopeOptionsEnabled () {
return this.$store.state.instance.scopeOptionsEnabled