diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-09-01 05:57:58 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-09-01 05:57:58 +0000 |
| commit | 20b0ffc0b9978799ed34fc3b8c85aa8fe56f2eeb (patch) | |
| tree | 1fd8359715114cf4ba6fef8e7f6d69ff63bf1d26 /src/components/post_status_form | |
| parent | a8ae2a5b11a1afd5b1317e5b36130782864a4f10 (diff) | |
| parent | d6240c25cf975e743511623563193dea1dc9cc53 (diff) | |
Merge branch 'imvomitingasicodethisshit' into 'develop'
Made showing format selection optional and default to false
See merge request pleroma/pleroma-fe!329
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 3 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 7d2735c5..d7f1ffb2 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -139,6 +139,9 @@ const PostStatusForm = { }, scopeOptionsEnabled () { return this.$store.state.config.scopeOptionsEnabled + }, + formattingOptionsEnabled () { + return this.$store.state.config.formattingOptionsEnabled } }, methods: { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 543ab527..559ad016 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -33,7 +33,7 @@ @paste="paste"> </textarea> <div class="visibility-tray"> - <span class="text-format"> + <span class="text-format" v-if="formattingOptionsEnabled"> <label for="post-content-type" class="select"> <select id="post-content-type" v-model="newStatus.contentType" class="form-control"> <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option> |