From 2d453e635572dd640d4f5e1ecd7837b5874bd250 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Thu, 21 Feb 2019 17:06:10 +0000
Subject: [PATCH] Merge branch 'issue-383-content-type' into 'develop'

#383: content type error

Closes #383

See merge request pleroma/pleroma-fe!603

(cherry picked from commit 254b0afab747ad6e67b675bdf233b9dfcbc59f0b)

09822cc1 #383: content type error
---
 src/components/post_status_form/post_status_form.js  | 12 ++++++------
 src/components/post_status_form/post_status_form.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ab379c23..c28c51bf 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -56,6 +56,10 @@ const PostStatusForm = {
           ? this.copyMessageScope
           : this.$store.state.users.currentUser.default_scope
 
+    const contentType = typeof this.$store.state.config.postContentType === 'undefined'
+      ? this.$store.state.instance.postContentType
+      : this.$store.state.config.postContentType
+
     return {
       dropFiles: [],
       submitDisabled: false,
@@ -67,7 +71,8 @@ const PostStatusForm = {
         status: statusText,
         nsfw: false,
         files: [],
-        visibility: scope
+        visibility: scope,
+        contentType
       },
       caret: 0
     }
@@ -166,11 +171,6 @@ const PostStatusForm = {
     },
     formattingOptionsEnabled () {
       return this.$store.state.instance.formattingOptionsEnabled
-    },
-    defaultPostContentType () {
-      return typeof this.$store.state.config.postContentType === 'undefined'
-        ? this.$store.state.instance.postContentType
-        : this.$store.state.config.postContentType
     }
   },
   methods: {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 6ed5d92e..e09ad37f 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -35,7 +35,7 @@
       <div class="visibility-tray">
         <span class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">
-            <select id="post-content-type" v-model="defaultPostContentType" class="form-control">
+            <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
               <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
               <option value="text/html">HTML</option>
               <option value="text/markdown">Markdown</option>