Merge branch 'reply-preserve-subject' into 'develop'

Preserve subject in replies.

See merge request pleroma/pleroma-fe!318
This commit is contained in:
kaniini 2018-08-26 01:22:13 +00:00
commit 256aa25a11
3 changed files with 10 additions and 2 deletions

View file

@ -24,7 +24,8 @@ const PostStatusForm = {
'replyTo',
'repliedUser',
'attentions',
'messageScope'
'messageScope',
'subject'
],
components: {
MediaUpload
@ -52,6 +53,7 @@ const PostStatusForm = {
posting: false,
highlighted: 0,
newStatus: {
spoilerText: this.subject,
status: statusText,
nsfw: false,
files: [],

View file

@ -173,6 +173,12 @@ const Status = {
}
return true
},
replySubject () {
if (this.status.summary && !this.status.summary.match(/^re[: ]/i)) {
return 're: '.concat(this.status.summary)
}
return this.status.summary
},
attachmentSize () {
if ((this.$store.state.config.hideAttachments && !this.inConversation) ||
(this.$store.state.config.hideAttachmentsInConv && this.inConversation)) {

View file

@ -102,7 +102,7 @@
</div>
<div class="container" v-if="replying">
<div class="reply-left"/>
<post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" :message-scope="status.visibility" v-on:posted="toggleReplying"/>
<post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" :message-scope="status.visibility" :subject="replySubject" v-on:posted="toggleReplying"/>
</div>
</template>
</div>