imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add featured users to Group View

Browse source
This commit is contained in:
David Baker 2017-07-10 19:32:02 +01:00
parent 0e67a9158c
commit 925d5bd480
3 changed files with 135 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View file

@ -506,7 +506,7 @@ module.exports = React.createClass({
this._setMxId(payload);
break;
case 'view_start_chat_or_reuse':
this._chatCreateOrReuse(payload.user_id);
this._chatCreateOrReuse(payload.user_id, payload.go_home_on_cancel);
break;
case 'view_create_chat':
this._createChat();
@ -801,7 +801,9 @@ module.exports = React.createClass({
});
},
_chatCreateOrReuse: function(userId) {
_chatCreateOrReuse: function(userId, go_home_on_cancel) {
if (go_home_on_cancel === undefined) go_home_on_cancel = true;
const ChatCreateOrReuseDialog = sdk.getComponent(
'views.dialogs.ChatCreateOrReuseDialog',
);
@ -832,7 +834,7 @@ module.exports = React.createClass({
const close = Modal.createDialog(ChatCreateOrReuseDialog, {
userId: userId,
onFinished: (success) => {
if (!success) {
if (!success && go_home_on_cancel) {
// Dialog cancelled, default to home
dis.dispatch({ action: 'view_home_page' });
}