aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-09 11:59:49 +0000
committerkaniini <nenolod@gmail.com>2018-09-09 11:59:49 +0000
commited6abeacadc2bced05f3221b2c57ba488f0ae800 (patch)
treea27025296b5f54d307b3448571260b2624c869b2 /src/main.js
parent369fd648f6dfee51f7fec269e5f5cb530f2ca3d6 (diff)
parent5726be68307f0215470d2e5baea105718b5039fe (diff)
Merge branch 'post-polish-fixes' into 'develop'
Post polish fixes See merge request pleroma/pleroma-fe!333
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.js b/src/main.js
index 959df91f..75c2bab2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -117,7 +117,7 @@ window.fetch('/api/statusnet/config.json')
var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
var scopeOptionsEnabled = (config.scopeOptionsEnabled)
var formattingOptionsEnabled = (config.formattingOptionsEnabled)
- var collapseMessageWithSubject = (config.collapseMessageWithSubject)
+ var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject)
store.dispatch('setOption', { name: 'theme', value: theme })
store.dispatch('setOption', { name: 'background', value: background })
@@ -127,7 +127,7 @@ window.fetch('/api/statusnet/config.json')
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 })
+ store.dispatch('setOption', { name: 'defaultCollapseMessageWithSubject', value: defaultCollapseMessageWithSubject })
if (chatDisabled) {
store.dispatch('disableChat')
}