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

Merge branch 'develop' into bwindels/stylepreviewbar

Browse Source
This commit is contained in:
Bruno Windels
2019-04-17 11:06:21 +02:00
parent 1100320351 65020a56c1
commit 22874f62ab
25 changed files with 280 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/structures/MatrixChat.js
View File

@@ -565,23 +565,6 @@ export default React.createClass({
},
});
break;
case 'view_user':
// FIXME: ugly hack to expand the RightPanel and then re-dispatch.
if (this.state.collapsedRhs) {
setTimeout(()=>{
dis.dispatch({
action: 'show_right_panel',
});
dis.dispatch({
action: 'view_user',
member: payload.member,
});
}, 0);
}
break;
// different from view_user,
// this show the user panel outside of the context
// of a room, like a /user/<id> url
case 'view_user_info':
this._viewUser(payload.userId);
break;
@@ -1820,7 +1803,7 @@ export default React.createClass({
},
_setPageSubtitle: function(subtitle='') {
document.title = `Riot ${subtitle}`;
document.title = `${SdkConfig.get().brand || 'Riot'} ${subtitle}`;
},
updateStatusIndicator: function(state, prevState) {