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

Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified

Browse source
This commit is contained in:
Richard van der Hoff 2017-01-26 14:09:25 +00:00
commit 67bd2cf9dd
49 changed files with 2251 additions and 682 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/views/rooms/MessageComposerInput.js
View file

@ -40,6 +40,7 @@ import * as HtmlUtils from '../../../HtmlUtils';
import Autocomplete from './Autocomplete';
import {Completion} from "../../../autocomplete/Autocompleter";
import Markdown from '../../../Markdown';
import {onSendMessageFailed} from './MessageComposerInputOld';
const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
@ -553,23 +554,11 @@ export default class MessageComposerInput extends React.Component {
sendMessagePromise = sendTextFn.call(this.client, this.props.room.roomId, contentText);
}
var self = this;
sendMessagePromise.then((res) => {
sendMessagePromise.done((res) => {
dis.dispatch({
action: 'message_sent',
});
}, (err) => {
if (err.name === "UnknownDeviceError") {
var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices,
room: self.props.room,
});
}
dis.dispatch({
action: 'message_send_failed',
});
});
}, (e) => onSendMessageFailed(e, this.props.room));
this.setState({
editorState: this.createEditorState(),