diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:52:54 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:52:54 +0000 |
| commit | 88c9ab44521d20d119a82684e7a55a0caf22ca17 (patch) | |
| tree | 0ae44ea013aeb0bf5c4fadf4e770b0d2694575bd /src/components/post_status_form | |
| parent | c07adb71212e6ffe73deb58f0efade8264e7f7b9 (diff) | |
| parent | 158342fc394b7fded6e25b8cb40516ccaff6ac26 (diff) | |
Merge branch 'cw-clickthrough' into 'develop'
Add click-to-show content warnings on posts
See merge request pleroma/pleroma-fe!291
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 4f4c6aca..4f6cee9c 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -24,7 +24,8 @@ const PostStatusForm = { 'replyTo', 'repliedUser', 'attentions', - 'messageScope' + 'messageScope', + 'parentSpoilerText' ], components: { MediaUpload @@ -50,7 +51,8 @@ const PostStatusForm = { newStatus: { status: statusText, files: [], - visibility: this.messageScope || 'public' + visibility: this.messageScope || 'public', + spoilerText: this.parentSpoilerText || null }, caret: 0 } |