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

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauth

This commit is contained in:
Roger Braun 2018-11-10 11:00:09 +01:00
parent cf581b7d5a 2c2c4452b9
commit 9f64c96721
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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
@ -223,6 +226,7 @@ const PostStatusForm = {
if (!data.error) {
this.newStatus = {
status: '',
spoilerText: '',
files: [],
visibility: newStatus.visibility,
contentType: newStatus.contentType