diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-03-06 21:13:12 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-03-06 21:13:12 -0500 |
commit | e87f5c6cf912a4f650a056ee042f19268963177d (patch) | |
tree | 5bd573a645e8a3931ca2ee7131cac75d58871a5f /webapp/components/user_settings/user_settings_advanced.jsx | |
parent | f99658152ac2e188d8196758ef5c635eaa3b3ae7 (diff) | |
download | chat-e87f5c6cf912a4f650a056ee042f19268963177d.tar.gz chat-e87f5c6cf912a4f650a056ee042f19268963177d.tar.bz2 chat-e87f5c6cf912a4f650a056ee042f19268963177d.zip |
Add system console switch for enabling link previews (#5663)
Diffstat (limited to 'webapp/components/user_settings/user_settings_advanced.jsx')
-rw-r--r-- | webapp/components/user_settings/user_settings_advanced.jsx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx index 6e3d488e1..3459af8b3 100644 --- a/webapp/components/user_settings/user_settings_advanced.jsx +++ b/webapp/components/user_settings/user_settings_advanced.jsx @@ -53,14 +53,19 @@ export default class AdvancedSettingsDisplay extends React.Component { ) }; - let enabledFeatures = 0; - for (const [name, value] of advancedSettings) { - const webrtcEnabled = global.mm_config.EnableWebrtc === 'true'; + const webrtcEnabled = global.mm_config.EnableWebrtc === 'true'; + const linkPreviewsEnabled = global.mm_config.EnableLinkPreviews === 'true'; - if (!webrtcEnabled) { - preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW'); - } + if (!webrtcEnabled) { + preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW'); + } + if (!linkPreviewsEnabled) { + preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'EMBED_PREVIEW'); + } + + let enabledFeatures = 0; + for (const [name, value] of advancedSettings) { for (const key of preReleaseFeaturesKeys) { const feature = PreReleaseFeatures[key]; |