OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

lets improve forwarding :D 

ditch double quotes
stop caring about rhs state
always call hide_right_panel, nop if already hidden
use new restore_right_panel to bring it back if it was visible pre-us

actually tell things that we sent a message or failed in doing so
now the UDE works :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2017-04-24 22:14:45 +01:00
parent 28a2266f70
commit 9ae9aeea07
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/views/rooms/ForwardMessage.js
View File

@ -18,7 +18,7 @@
import React from 'react'; import React from 'react';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import KeyCode from "../../../KeyCode"; import KeyCode from '../../../KeyCode';
module.exports = React.createClass({ module.exports = React.createClass({
@ -28,20 +28,13 @@ module.exports = React.createClass({
currentRoomId: React.PropTypes.string.isRequired, currentRoomId: React.PropTypes.string.isRequired,
content: React.PropTypes.object.isRequired, content: React.PropTypes.object.isRequired,
// true if RightPanel is collapsed
collapsedRhs: React.PropTypes.bool,
onCancelClick: React.PropTypes.func.isRequired, onCancelClick: React.PropTypes.func.isRequired,
}, },
componentWillMount: function() { componentWillMount: function() {
this._unmounted = false; this._unmounted = false;
if (!this.props.collapsedRhs) { dis.dispatch({action: 'hide_right_panel'});
dis.dispatch({
action: 'hide_right_panel',
});
}
dis.dispatch({ dis.dispatch({
action: 'ui_opacity', action: 'ui_opacity',
sideOpacity: 1.0, sideOpacity: 1.0,
@ -57,12 +50,7 @@ module.exports = React.createClass({
componentWillUnmount: function() { componentWillUnmount: function() {
this._unmounted = true; this._unmounted = true;
if (!this.props.collapsedRhs) { dis.dispatch({action: 'restore_right_panel'});
dis.dispatch({
action: 'show_right_panel',
});
}
dis.dispatch({ dis.dispatch({
action: 'ui_opacity', action: 'ui_opacity',
sideOpacity: 1.0, sideOpacity: 1.0,
@ -74,7 +62,19 @@ module.exports = React.createClass({
onAction: function(payload) { onAction: function(payload) {
if (payload.action === 'view_room') { if (payload.action === 'view_room') {
MatrixClientPeg.get().sendMessage(payload.room_id, this.props.content); const Client = MatrixClientPeg.get();
Client.sendMessage(payload.room_id, this.props.content).done(() => {
dis.dispatch({action: 'message_sent'});
}, (err) => {
if (err.name === "UnknownDeviceError") {
dis.dispatch({
action: 'unknown_device_error',
err: err,
room: Client.getRoom(payload.room_id),
});
}
dis.dispatch({action: 'message_send_failed'});
});
if (this.props.currentRoomId === payload.room_id) this.props.onCancelClick(); if (this.props.currentRoomId === payload.room_id) this.props.onCancelClick();
} }
}, },