Merge branch 'imvomitingasicodethisshit' into 'develop'

Made showing format selection optional and default to false

See merge request pleroma/pleroma-fe!329

1 files changed, 2 insertions, 0 deletions

diff --git a/src/main.js b/src/main.js
index 72806d10..debd8703 100644
--- a/src/main.js
+++ b/src/main.js
@@ -119,6 +119,7 @@ window.fetch('/api/statusnet/config.json')
       var whoToFollowLink = (config.whoToFollowLink)
       var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
       var scopeOptionsEnabled = (config.scopeOptionsEnabled)
+      var formattingOptionsEnabled = (config.formattingOptionsEnabled)
       var collapseMessageWithSubject = (config.collapseMessageWithSubject)
 
       store.dispatch('setOption', { name: 'theme', value: theme })
@@ -131,6 +132,7 @@ window.fetch('/api/statusnet/config.json')
       store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink })
       store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
       store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
+      store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
       store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
       if (chatDisabled) {
         store.dispatch('disableChat')