OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge timeline section into one 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-04-30 11:03:22 +02:00
parent 192c0c4941
commit 2c7139fb4d
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
View File

@ -71,7 +71,7 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
'autoplayGifsAndVideos',
'showImages',
];
static THINGS_TO_HIDE_ON_TIMELINE_SETTINGS = [
static TIMELINE_SETTINGS = [
'showTypingNotifications',
'showRedactions',
'showReadReceipts',
@ -79,14 +79,10 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
'showDisplaynameChanges',
'showChatEffects',
'showAvatarChanges',
];
static TIMELINE_SETTINGS = [
'Pill.shouldShowPillAvatar',
'TextualBody.enableBigEmoji',
'scrollToBottomOnMessageSent',
'Pill.shouldShowPillAvatar',
];
static GENERAL_SETTINGS = [
'TagPanel.enableTagPanel',
'promptBeforeInviteUnknownUsers',
@ -259,11 +255,6 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
{this.renderGroup(PreferencesUserSettingsTab.IMAGES_AND_VIDEOS_SETTINGS)}
</div>
<div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Hide things on the timeline")}</span>
{this.renderGroup(PreferencesUserSettingsTab.THINGS_TO_HIDE_ON_TIMELINE_SETTINGS)}
</div>
<div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Timeline")}</span>
{this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}