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

Merge branch 'develop' into matthew/notif-panel

Browse source
This commit is contained in:
Matthew Hodgson 2016-09-09 11:12:52 +01:00
commit 904348e62a
14 changed files with 898 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -370,6 +370,9 @@ module.exports = React.createClass({
this._setPage(this.PageTypes.RoomDirectory);
this.notifyNewScreen('directory');
break;
case 'view_create_chat':
this._createChat();
break;
case 'notifier_enabled':
this.forceUpdate();
break;
@ -506,6 +509,13 @@ module.exports = React.createClass({
}
},
_createChat: function() {
var ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
Modal.createDialog(ChatInviteDialog, {
title: "Start a one to one chat",
});
},
// update scrollStateMap according to the current scroll state of the
// room view.
_updateScrollMap: function() {