aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-12 07:20:39 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-12 07:20:39 +0000
commit17f6eb18e73a46c0268d9c7bc46f755ac5da1b6f (patch)
tree9bcad7b89374bca414d413aea7525ade42c89f8e /src/main.js
parent88c9ab44521d20d119a82684e7a55a0caf22ca17 (diff)
Revert "Merge branch 'cw-clickthrough' into 'develop'"
This reverts merge request !291
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main.js b/src/main.js
index 01ee7f75..bacd7f6d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -89,7 +89,7 @@ window.fetch('/api/statusnet/config.json')
window.fetch('/static/config.json')
.then((res) => res.json())
.then((data) => {
- const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled, clickThroughContentWarningsEnabled} = data
+ const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled} = data
store.dispatch('setOption', { name: 'theme', value: theme })
store.dispatch('setOption', { name: 'background', value: background })
store.dispatch('setOption', { name: 'logo', value: logo })
@@ -98,8 +98,6 @@ window.fetch('/static/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: 'clickThroughContentWarningsEnabled', value: clickThroughContentWarningsEnabled })
-
if (data['chatDisabled']) {
store.dispatch('disableChat')
}