itepechi/akkoma-fe
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Merge branch 'cherry-pick-254b0afa' into 'master'

Browse source 
Merge default content-type fix into master

See merge request pleroma/pleroma-fe!609
This commit is contained in:
Shpuld Shpludson 2019-02-22 16:34:29 +00:00
commit 4800169f36
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/post_status_form/post_status_form.js
View file

@ -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: {

2
src/components/post_status_form/post_status_form.vue
View file

@ -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>