matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate
2018-01-12 09:41:19 +00:00
parent 7a324b4104 3371506960
commit bd1312f673
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/EventTile.js
View File

@@ -517,7 +517,7 @@ module.exports = withMatrixClient(React.createClass({
if (needsSenderProfile) { if (needsSenderProfile) {
let text = null; let text = null;
if (!this.props.tileShape) { if (!this.props.tileShape || this.props.tileShape === 'quote') {
if (msgtype === 'm.image') text = _td('%(senderName)s sent an image'); if (msgtype === 'm.image') text = _td('%(senderName)s sent an image');
else if (msgtype === 'm.video') text = _td('%(senderName)s sent a video'); else if (msgtype === 'm.video') text = _td('%(senderName)s sent a video');
else if (msgtype === 'm.file') text = _td('%(senderName)s uploaded a file'); else if (msgtype === 'm.file') text = _td('%(senderName)s uploaded a file');

1
src/components/views/rooms/MessageComposerInput.js
View File

@@ -273,6 +273,7 @@ export default class MessageComposerInput extends React.Component {
let contentState = this.state.editorState.getCurrentContent(); let contentState = this.state.editorState.getCurrentContent();
switch (payload.action) { switch (payload.action) {
case 'quote_event':
case 'focus_composer': case 'focus_composer':
editor.focus(); editor.focus();
break; break;