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

Merge branch 'develop' into new-guest-access

Browse Source 
Conflicts:
	src/component-index.js
This commit is contained in:
Luke Barnard
2017-05-11 13:22:30 +01:00
parent 6ba1d382b0 8a76c0c142
commit 5151264f60
33 changed files with 718 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,9 +395,10 @@ module.exports = React.createClass({
this.notifyNewScreen('forgot_password');
break;
case 'leave_room':
const roomToLeave = MatrixClientPeg.get().getRoom(payload.room_id);
Modal.createDialog(QuestionDialog, {
title: "Leave room",
description: "Are you sure you want to leave the room?",
description: <span>Are you sure you want to leave the room <i>{roomToLeave.name}</i>?</span>,
onFinished: (should_leave) => {
if (should_leave) {
const d = MatrixClientPeg.get().leave(payload.room_id);