From ee560a969a17591ea39590a61bc0f3327e9df8ab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 20:17:29 +0100
Subject: [PATCH] upon forwarding message to current room, explicitly remove
clear from aux
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/RoomView.js | 2 +-
src/components/views/rooms/ForwardMessage.js | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 91d5e01f78..e941c6b1a8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1614,7 +1614,7 @@ module.exports = React.createClass({
let aux = null;
if (this.state.forwardingMessage !== null) {
- aux = ;
+ aux = ;
} else if (this.state.editingRoomSettings) {
aux = ;
} else if (this.state.uploadingRoomSettings) {
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 42e2465037..bb401dde69 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -25,6 +25,7 @@ module.exports = React.createClass({
displayName: 'ForwardMessage',
propTypes: {
+ currentRoomId: React.PropTypes.string.isRequired,
content: React.PropTypes.object.isRequired,
// true if RightPanel is collapsed
@@ -74,6 +75,7 @@ module.exports = React.createClass({
onAction: function(payload) {
if (payload.action === 'view_room') {
MatrixClientPeg.get().sendMessage(payload.room_id, this.props.content);
+ if (this.props.currentRoomId === payload.room_id) this.props.onCancelClick();
}
},