mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 20:41:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge timeline section into one

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Š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', 'autoplayGifsAndVideos',
'showImages', 'showImages',
]; ];
static THINGS_TO_HIDE_ON_TIMELINE_SETTINGS = [ static TIMELINE_SETTINGS = [
'showTypingNotifications', 'showTypingNotifications',
'showRedactions', 'showRedactions',
'showReadReceipts', 'showReadReceipts',
@ -79,14 +79,10 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
'showDisplaynameChanges', 'showDisplaynameChanges',
'showChatEffects', 'showChatEffects',
'showAvatarChanges', 'showAvatarChanges',
]; 'Pill.shouldShowPillAvatar',
static TIMELINE_SETTINGS = [
'TextualBody.enableBigEmoji', 'TextualBody.enableBigEmoji',
'scrollToBottomOnMessageSent', 'scrollToBottomOnMessageSent',
'Pill.shouldShowPillAvatar',
]; ];
static GENERAL_SETTINGS = [ static GENERAL_SETTINGS = [
'TagPanel.enableTagPanel', 'TagPanel.enableTagPanel',
'promptBeforeInviteUnknownUsers', 'promptBeforeInviteUnknownUsers',
@ -259,11 +255,6 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
{this.renderGroup(PreferencesUserSettingsTab.IMAGES_AND_VIDEOS_SETTINGS)} {this.renderGroup(PreferencesUserSettingsTab.IMAGES_AND_VIDEOS_SETTINGS)}
</div> </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"> <div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Timeline")}</span> <span className="mx_SettingsTab_subheading">{_t("Timeline")}</span>
{this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)} {this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}