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

Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting 

Add a scroll to bottom on message sent setting
pull/21833/head
Travis Ralston 2021-03-02 17:41:15 -07:00 committed by GitHub
parent 054330c07b 6fcb4c7cd2
commit c7d4dfa4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/SendMessageComposer.js
View File

@ -404,7 +404,9 @@ export default class SendMessageComposer extends React.Component {
this._editorRef.clearUndoHistory(); this._editorRef.clearUndoHistory();
this._editorRef.focus(); this._editorRef.focus();
this._clearStoredEditorState(); this._clearStoredEditorState();
dis.dispatch({action: "scroll_to_bottom"}); if (SettingsStore.getValue("scrollToBottomOnMessageSent")) {
dis.dispatch({action: "scroll_to_bottom"});
}
} }
componentWillUnmount() { componentWillUnmount() {

1
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View File

@ -48,6 +48,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
'showRedactions', 'showRedactions',
'enableSyntaxHighlightLanguageDetection', 'enableSyntaxHighlightLanguageDetection',
'expandCodeByDefault', 'expandCodeByDefault',
'scrollToBottomOnMessageSent',
'showCodeLineNumbers', 'showCodeLineNumbers',
'showJoinLeaves', 'showJoinLeaves',
'showAvatarChanges', 'showAvatarChanges',

1
src/i18n/strings/en_EN.json
View File

@ -809,6 +809,7 @@
"Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting", "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
"Expand code blocks by default": "Expand code blocks by default", "Expand code blocks by default": "Expand code blocks by default",
"Show line numbers in code blocks": "Show line numbers in code blocks", "Show line numbers in code blocks": "Show line numbers in code blocks",
"Jump to the bottom of the timeline when you send a message": "Jump to the bottom of the timeline when you send a message",
"Show avatars in user and room mentions": "Show avatars in user and room mentions", "Show avatars in user and room mentions": "Show avatars in user and room mentions",
"Enable big emoji in chat": "Enable big emoji in chat", "Enable big emoji in chat": "Enable big emoji in chat",
"Send typing notifications": "Send typing notifications", "Send typing notifications": "Send typing notifications",

5
src/settings/Settings.ts
View File

@ -330,6 +330,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
displayName: _td('Show line numbers in code blocks'), displayName: _td('Show line numbers in code blocks'),
default: true, default: true,
}, },
"scrollToBottomOnMessageSent": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Jump to the bottom of the timeline when you send a message'),
default: true,
},
"Pill.shouldShowPillAvatar": { "Pill.shouldShowPillAvatar": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS, supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Show avatars in user and room mentions'), displayName: _td('Show avatars in user and room mentions'),